adding align
Merge branch 'master' of github.com:puzl/dotvim

Conflicts:
	.gitmodules
Merge branch 'master' of github.com:puzl/dotvim

Conflicts:
	autoload/cscope_maps.vim
	vimrc