Merge pull request #1 from sampaisley/master

Master
Merge pull request #2 from sampaisley/master

no foo boo
Merge pull request #3 from sampaisley/gh-pages

pull me 1