updating digitalocean image_id for ubuntu-12.04
[COOK-4643] - Update metadata lock on ohai

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4588] - Give more love to FreeBSD

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4601] Add proxy type: Socket

Signed-off-by: Sean OMeara <someara@opscode.com>
Version bump to 2.7.0
Publish 2.7.0 Changelog
bumping for devodd
Merge branch 'master' into integration

Conflicts:
	metadata.rb
	recipes/default.rb
	recipes/socketproxy.rb