updating master to match gh-pages
updating master to match gh-pages
Merge pull request #1 from danieltaylor/master

Master