Switched to Shugo's stuff to utilise Unite.vim, also some cleanup