Update seed file to not contain Amazon API keys
Add database.yml and secrets.yml to gitignore
fix conflict for database yml
Fix merge conflict
Merge pull request #32 from spring-peepers-2014/item_seeds

Remove Amazon API key from seed file for security