source maps
remove deploy and js watch
rejigger header
Merge branch '2.0'

Conflicts:
	craft/templates/layouts/base.html