removed bang at end of imageorient in image uploader
bringin up to speed
Merge branch 'develop'

Conflicts:
	app/uploaders/image_uploader.rb
	log/development.log
	tmp/pids/server.pid
auto-orient works without banglocally
last commit for heroku and s3
all seems to be working with heroku and S3