Revert "Merge pull request #1 from basekit/master"

Seems to be a loop in pull requests. Should only pull request **into** ```gh-pages```.

* ```master```: for working in
* ```gh-pages```: live deployment