Add configurable tweet app options
Merge branch 'dev' into conftweets

* dev:
  Add configurable tweet app options

Conflicts:
	app/views/tweets/index.html.haml
	config/initializers/tweet_searcher.rb
Fix atom feed
Merge branch 'dev' into conftweets

* dev:
  Fix atom feed