Add merge aliases for "into-master" and "into-staging"
Import token for GHI
Additions to vimrc

* Add closetag plugin and autocmd for all filetypes that use HTML
* Add spell check and visual column for commit messages
* Add mappings etc. for fuzzy finder plugins