Use js2-mode instead of prelude js
updated testing magit
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	personal/my.el