precompile assets
Merge branch 'master' of github.com:pnblackwell/feed_engine

Conflicts:
	public/assets/application-734f66d417189e009135c37380475c64.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/manifest.yml
500px
500px integrated
update feed_spec
500px
reject existing feed_items
fixed duplicate twitter icon
Fix mother of all merge conflicts
Add back :active_record_store to session_store initializer to avoid cookie overflow error when new users are redirected back to our site after twitter log in