Dev

Vim config complete (for now) ready to merge back into master.