ignoring dir .grunt
removing aliases for o-phantom and o-jasmine
using p4merge as the default mergetool
using NeoBundle instead of Vundle