Updating ctags per shaun's feedback
Merge branch 'master' of github.com:aaronzirbes/vim-files

Conflicts:
	ctags
Removing startify
Merge branch 'master' of github.com:aaronzirbes/vim-files
Making my test runner work with the gradle build
Merge branch 'master' of github.com:aaronzirbes/vim-files

Conflicts:
	vimrc