Modified to not automatically remove trailing whitespace when saving.
Merged .vimrc.
Merged bashrc.