Removed emacs aliases
added mvim alias for vimr
Merge branch 'feature/new_aliases' into develop