do not watch dist/
require coffeescript/register
ignore production.js (to avoid commiting passwords)
various fixes
Merge branch 'dev'

Conflicts:
	.gitignore