Fixed some problems with setting file associations properly - esp with regards to js2-mode and the reg-exp used to match file extensions
Merge remote-tracking branch 'refs/remotes/origin/jn-little' into new-master