merge with upstream
Merge branch 'master' of github.com:beetleman/prelude