Better support for chrome-dev-testing
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	js/main.js
Fixing issue where test pages is being rendered