update neobundle
Merge remote-tracking branch 'origin/master'
add eslintrc
remove weirdness
enable git rerere
some handy vim stuff