Tweaks makefile to hopefully fix Travis pushing to gh-pages.
Adds more tests for Travis! \o/
Merge branch 'master' into gh-pages