added s-insert behaviour for vim
Merge branch 'master' of github.com:JustinHop/Profile
This will end poorly
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	python/.ropeproject/config.py
	python/README.md
	python/d/main.py
	python/vidmanage/.ropeproject/config.py
	python/vidmanage/main.py
	python/vidmanage/project/.ropeproject/config.py
	python/vidmanage/project/main.py
Deleted some extr stuxx
Merge branch 'master' of github.com:JustinHop/Profile