Add links to Github and Gist in shortcuts
Update vimrc_concatenated
Merge branch 'master' into mac