YCM stuff
Merge remote-tracking branch 'origin/master'

* origin/master:
  Replaced YCM w/ Neocomplete by default
  Added ember.vim
  Updated neocomplete
  Random vim cleanup items

Conflicts:
	vim/vundles.vim