Added framework for uploading images to S3. Changed some code to conform more closely to Rails conventions.
Merged Nolan & Robinson commits, modified tests to fit changes in code