proper indent (+1 squashed commit)
Squashed commits:
[5886251] fix
Merge branch 'master' of https://github.com/petermm/carrierwave-serializable