Minor changes
Code style
Merge branch 'master' of github.com:bbatsov/prelude
Misc settings