Add grunt.vim
Ignore node_modules in ctrl p
Merge branch 'master' of github.com:alex-tan/dotfiles

Conflicts:
	vimrc