added *.vim to gitignore again
Merge branch 'development' of github.com:YaleSTC/shifts into development