Merge branch 'master' of github.com:einars/js-beautify into gh-pages