Set up rbenv and fish correctly
Git auto-setup-rebase
Merge branch 'master' into work
Remove disabled atom packages
Don't keep (most) atom packages in version control
Merge branch 'master' into work