update sparkup
Merge branch 'master' of github.com:thomaspeklak/vim-config
Merge branch 'master' of github.com:thomaspeklak/vim-config

Conflicts:
	bundles.vim
Merge branch 'master' of github.com:thomaspeklak/vim-config
update ctrlp mappings