Bump Ruby to 2.1.4. Pick up latest of omnibus / omnibus-software. Testing chef / ohai for RC.
Merge pull request #276 from opscode/sersut/12-rc

Final RC tuneups.
Update to pull in updated omnibus commits
Merge pull request #277 from opscode/shain/update_lock

Update to pull in updated omnibus commits
Merge branch 'master' into mcquin/rspec-3

Conflicts:
	config/projects/chef.rb
Update Gemfile.lock