Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937
Merge branch 'master' of github.com:discourse/discourse
update some gems
we need this eager load thing