fixups for prelude update
Merge branch 'master' of github.com:zacaway/prelude