removed conflict
Merge branch 'master' of https://github.com/rain0r/dotvim

Conflicts:
	skeletons/skeleton.py