Started combining things
Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Conflicts:
	vimrc
Added essential vim files
Updated ignore file
Changed name to keep