upgrade to ruby 2.1.2.
Merge branch 'enhancements'

Conflicts:
	spec/controllers/pages_controller_spec.rb
	spec/features/location_machine_xrefs_controller_spec.rb
	spec/models/location_machine_xref_spec.rb
	spec/requests/api/v1/location_machine_xrefs_controller_spec.rb
	spec/requests/api/v1/locations_controller_spec.rb
	spec/requests/api/v1/machine_score_xrefs_controller_spec.rb