vim: read 2 modelines
Merge branch 'master' of https://github.com/adamcstephens/dotfiles