tweets/index.json and production mongoid.yml
some code to test heroku
Merge branch 'master' of heroku.com:alarmer

* 'master' of heroku.com:alarmer:
  tweets/index.json and production mongoid.yml

Conflicts:
	app/controllers/tweets_controller.rb
some code to test heroku
Merge branch 'master' of heroku.com:alarmer

* 'master' of heroku.com:alarmer:
user scaffold
config db yml for heroku
added rails12factor gem
added rails12factor gem
Merge branch 'master' of heroku.com:alarmer

* 'master' of heroku.com:alarmer:
  added rails12factor gem
added header to avoid cross domain prbls
removed users scaffold
working get tweets with basic fnc