Merge pull request #26 from johnpapa/develop

Massive swap to serve from build folder all the time