Add vim-swift plugin
Git: add --show-linear-break to default log alias
Git: don't futilely try to alias builtins
merge-feature and stage-feature aliases

For merging the current topic branch into master and staging
respectively. Updates the target branch first to make sure you'll be
able to push.