adding vim as editor, scripts, npm path
Merge branch 'master' of git://github.com/dandesousa/castle
Adding proper git diffing, file cleanup