Added fiagro again, changes to uploading.
Merge branch 'develop' into deploy
Fixes issue where current_user is nil when user is not logged in.
Merge branch 'develop' into deploy
Updated gemfile for rubber and friendly_id.
Merged from develop for gemfile changes.
I would fucking forget the gemfile.lock.
Added new sliders for home page. Fugly but functional.
Added thin for development.
Merged from develop.
Updated production host name.