Merge pull request #15 from calebbradley/master

Merge pull request #14 from calebbradley/gh-pages
Merge pull request #16 from calebbradley/master

trying to fix 404 errors!
Merge pull request #17 from calebbradley/master

changed a few .js files around to try to fix 404 consol errors on gh-pag...
Merge pull request #18 from calebbradley/gh-pages

catch up merges