allow different regions for S3 buckets
add AWS_REGION env var. trim whitespace
Merge branch 'master' into heroku-modifications
Merge branch 'master' into heroku-modifications
Merge branch 'heroku-modifications' of github.com:Tahi-project/tahi into heroku-modifications
Merge branch 'master' into heroku-modifications

Conflicts:
	README.md
Set AWS_REGION in test
Merge pull request #444 from Tahi-project/heroku-modifications

add AWS_REGION env variable