Tidy config + tidy up code
small cleanup
Merge pull request #1 from marcoscaceres/gh-pages

Set up as an Editor's draft.