Minor changes from Dialog workspace
Merge branch 'master' of https://github.com/weinimo/Configs-Vim

Conflicts:
	vimrc.local
Fixes from Dialog workspace

- Removed snippets/python.snippets as it prevents snipmate from working
- Minor other fixes