Merge pull request #1 from travisneilson/gh-pages

merge changes back to master
Merge pull request #2 from travisneilson/gh-pages

Lets see waht this does
Merge pull request #3 from travisneilson/master

Master