Added debuging features to .vimrc
Added splice to vundlerc
Merge remote-tracking branch 'origin/master' into marvin

Conflicts:
	home/dnoland/.vimrc
	home/dnoland/.vundlerc
Merge remote-tracking branch 'origin/navi' into marvin
Configured diffconflicts to ease future merges
Merge remote-tracking branch 'origin/marvin' into navi

All the hard work done in previous merge.
Cleaning up home dir