Adding langular package and js autocompletion
Adding show current file
Merge branch 'master' of github.com:jhollingworth/subvim

Conflicts:
	.gitmodules