Removed .vim since it's not required when using vundle. Also some setting tweaks.