Merge branch 'master' of git://github.com/bbatsov/prelude
Merge branch 'master' of github.com:trmwzm/prelude