don't email machine condition updates if they are blank or nil
Merge branch 'enhancements'
escape regex autocomplete searches
Merge branch 'enhancements'
prevent nil term searches in autocomplete from raising exceptions
Merge branch 'enhancements'
location suggest api documentation correction
Merge branch 'enhancements'
closest_by_lat_lon location endpoint for api v1
Merge branch 'enhancements'
update_desc tests for location

saving a location wasn't working because it was triggering the location validation code.. we still have some invalid phone numbers in the live database
do a background post of lpx submissions
Merge branch 'enhancements'
use FormData in lpx to serialize photo data
Merge branch 'enhancements'
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
remove deprecated twitter config options
extend initial search params to include zone, type, and machine... allow multiple values in search
Merge branch 'enhancements'