No need for these on gh-pages
Add CNAME for gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	Makefile
	python/jsbeautifier/__init__.py
	python/jsbeautifier/tests/testjsbeautifier.py
Merge branch 'master' into gh-pages
Include codemirror checkout in gh-pages so it doesn't die
Merge branch 'master' into gh-pages
Merge branch 'master' of github.com:einars/js-beautify into gh-pages
Merge branch 'master' of github.com:einars/js-beautify into gh-pages

Conflicts:
	python/jsbeautifier/__init__.py
	python/jsbeautifier/tests/testjsbeautifier.py
Merge branch 'master' of github.com:einars/js-beautify into gh-pages

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