Testimony: Uploader, controller, image in views.
Merge branch 'master' of github.com:paulsutcliffe/lainonrails4