Corrects spelling of Unite plugin.
Tidies up .vimrc.

Moves filetype settings to separate vim files.
Updates VAM setup in .vimrc.
Merge branch 'master' into osx.

Conflicts:
	.vimrc