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
Minor changes to .gdbinit (bufferlab) and ssh config (elra)
Merge remote-tracking branch 'origin/navi' into marvin

Conflicts:
	home/dnoland/.gdbinit
Minor changes to .ssh/config