Added autosetupmerge option for Git
Added inputrc.terminal
New git defaults
Changed to my name
Merge remote-tracking branch 'bfolkens/master'
Took out some stuff that wasn't needed