2 space indent for JS
Merge branch 'master' of http://github.com/ramrengas/toolkit

Conflicts:
	emacs/init.el