changed to sqlite in the meantime (waiting for dynamodb)
Merge branch 'master' into dynamodb

Conflicts:
	config/database.yml