Gemfile: upgraded eventmachine.
Merge branch 'master' into upgrade2014
Update pebblebed
Gemfile: upgrade Unicorn.
Take klass and realm into account when querying posts by  external_ids to optimize postgres queries
Merge pull request #64 from bengler/upgrade2014

Update pebblebed
Update pebbles-cors
Add bin/grove, a tool for working with Grove data.
Fix nil exception in /posts/:uid when passing multiple terms and one does not resolve to a post.
Merge branch 'master' into consolidated_pull_requests

Conflicts:
	Gemfile
	Gemfile.lock
	api/v1/posts.rb