Merge branch 'dev' of github.com:yomguy/TimeSide into dev

diff --cc timeside/__init__.py
Simple merge

diff --cc timeside/grapher/render_analyzers.py
index 4d6bf52192e4731c9ece32458cca53d6b38b917b,bfda8dc5ea8ccedee10fc970ca357c63d00309f4..dc198ca1511bbf1f30fef71d4e6f009b0fd563ff
--- 1/timeside/grapher/render_analyzers.py
--- 2/timeside/grapher/render_analyzers.py
+++ b/timeside/grapher/render_analyzers.py
@@@ -18,12 -17,13 +17,13 @@@
  
  # You should have received a copy of the GNU General Public License
  # along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
+ 
  from __future__ import division
  
 -from timeside.core import implements, interfacedoc, abstract, get_processor
 -from timeside.api import IGrapher
 -from core import Grapher
 -from .. import analyzer
 +from ..core import implements, interfacedoc, abstract, get_processor
 +from ..api import IGrapher
 +from .core import Grapher
 +from ..exceptions import PIDError
  
  
  class DisplayAnalyzer(Grapher):