Random changes from the Xubuntu side
Merge branch 'master' of http://github.com/mkapolka/dot_files

Conflicts:
	home/.vimrc
Vimrc changes
Merge branch 'master' of http://github.com/mkapolka/dot_files
guioptions-=e