Fixes problem with parallel plots

Fixes a problem where parallel plots were not being displayed because of
custom axes.

Fixes #124
Merge pull request #127 from ElDeveloper/pps_bug

Fixes problem with parallel plots
Fixed view menu conflicts
Fixing indentation, comments and biplots visibility checkbox
Updating changelog
Merge pull request #130 from meganap/view_menu_2

Fixed view menu conflicts
Merge branch 'master' of git://github.com/qiime/emperor into issue_107

Conflicts:
	ChangeLog.md