improvements to user guide
messy commit
Merge remote-tracking branch 'upstream/master' into userguide
indexing page
Merge remote-tracking branch 'upstream/master' into userguide
improvements to consistency user guide
Merge pull request #374 from jabooth/userguide

Menpo's User guide