Merge branch 'gh-pages'

Conflicts:
	js/scripts.js
	js/scripts.min.js
Updated scripts. Sorry
Update README.md
Merge branch 'develop'. Project Zeppelin v0.4
Update _config.yml

Minor changes to base URLs
Merge branch 'master' into gh-pages