pull unused settings from production config
Merge branch 'master' of github.com:foodflow/locavores

* 'master' of github.com:foodflow/locavores:
  added dummy.html and fixed the name of Restaurants.html
added ingredient controller
Merge branch 'master' of github.com:foodflow/locavores

* 'master' of github.com:foodflow/locavores:
  fixed path on dummy.html