updating vimrc and vimrc.ember
Merge branch 'master' of github.com:marlonandrade/dotfiles

Conflicts:
	.vim/vimrc
Adjusting nerdtree repo submodule

- adding swo to global ignore
- adding .es6 as a js file