Commiting to test image upload to s3
Merge branch 'master' of https://github.com/crdschurch/crossroads.net