Misc. updates and new aliases
Updates mappings, plugins and filetype
Deletes conflicted file copy
Removes .bash_profile form the README