added ft shortcuts and removed ; for :
removed submods
fixed submodule issues, added st for sytnastic toggle
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bundle/vim-snippets