add 2048 module and update bundles
Merge branch 'master' of github.com:greyfade/vimfiles

Conflicts:
	.gitmodules