Changes to how splits are handled
Merge branch 'master' of https://github.com/GingertronMk1/Assot

Conflicts:
	Vim/.vimrc