update to rubyracer needed for mavericks
Merge branch 'develop' into task/update-ruby-racer

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #352 from atomical/task/update-ruby-racer

update to rubyracer needed for mavericks