Codeship
Merge branch 'nested_resources' into release
rm /work/labs/addressbook/spec/helpers/belongs_to_contact_helper_spec.rb
Removing tests from git
Merge branch 'release' into nested_resources

Conflicts:
	rspec_results.txt