Added some vimrc changes from home
Solved merge conflict with Atlanta
Fixed merge conflict on Atlanta
Modified .vimrc on Atlanta

Made both relative line numbers and character listings (tabs, trailing
whitespace, end of the line) depend on a specific computer before
showing up by default.