Misc. updates
Script to see who is using the swap
Merge branch 'master' of https://github.com/wezegege/config

Conflicts:
	.gitmodules
	config/vimrc