Adding in some class path stuff based on feedback from sudobangbang
Merge branch 'master' into gh-pages
Updating the gh-pages branch