Merge pull request #15 from luketower/mod14

Mod14
Merge pull request #16 from luketower/mod15

Mod15
config carrierwave for S3
change storage for uploaders to fog
Merge branch 'master' of github.com:luketower/myflix-sep-2013
config carrierwave for S3
Merge branch 'master' of github.com:luketower/myflix-sep-2013
Merge branch 'master' of github.com:luketower/myflix