moved .swp files into a common directory, so they don't spam DropBox with changes
Merge branch 'master' of github.com:AggroBoy/dotvim

Conflicts:
	.vimrc