Reorganize .vimrc
 * Get rid of settings that weren't needed
 * Group related settings together