Merge pull request #1 from slipperyhank/develop

Residue Problem
Fix watch-docs grunt task
Refactor conversion funcns, further clarify LOLI

- Fix conversion functions to always use the LOLI convention.
- Take conversion-related functions out of utils and put them in their
  own module.
- Put a section on conventions (LOLI, etc.) in usage docs.
- Fix existing conversion tests and add new ones.
Bump version
Merge branch 'release/0.1.7' into develop
Ignore github-docs
Use new gh-pages strategy in Gruntfile
LaTeXify residue example
Fix upload-github-docs task
Fix LaTeX stuff
Fix more LaTeX stuff
Start XOR example
Return partition and repertoire of repertoires of reducible mechanisms
Merge branch 'develop' of https://github.com/wmayner/pyphi into develop

Conflicts:
	pyphi/examples.py