Update database.yml to not use user/password and renamed test database
Merge branch 'master' of github.com:TIY-iron-shop/iron-shop
renamed test instance to something more appropriate
Merge branch 'master' into devise_emails
fixed schema