Mixed absolute and relative line numbers
Deleted excess whitespace at end of certain lines
Readded OS X compatibility for dotfiles
Added OS X functionality again; merge with master