Merge pull request #1 from JackDougherty/gh-pages

updates to master
Merge pull request #2 from JackDougherty/gh-pages

updates to master 2
Merge pull request #3 from JackDougherty/gh-pages

update to master 3
Merge pull request #4 from JackDougherty/gh-pages

update to master 4
removed geo folder
Merge pull request #5 from JackDougherty/master

removed geo folder