Merge pull request #58 from MessiJS/prepare-for-2oh-final

Fix gulpfile.js now that dist/ exists.
Merge branch 'button-spacing' into prepare-for-2oh-final
Fixes #54. Button spacing issue.