Fix the form on the page.
Hook up image
Add missing uploader
Using S3 for images, but only when live
Merge branch 'master' of heroku.com:zeppflyer-app

Conflicts:
	app/views/pics/new.html.erb