Merge pull request #318 from fmscode/master

Include location and machine data in recents API
rubocop compliance
Merge branch 'enhancements'
redirect milwaukee to wisconsin
include device type in machine comments
Merge branch 'enhancements'
fix bad rubocop suggestion in import_ifpa_tournaments
Merge branch 'enhancements'
blank location_type in api for location nulls out location_type
Merge branch 'enhancements'
ip and agent info on location suggestions
Merge branch 'enhancements'
put full region name in region notification emails
Merge branch 'enhancements'
to_s location_type on location update to account for Fixnum requests
Merge branch 'enhancements'
force region admin email sort order to prevent intermittent test failures
Merge branch 'enhancements'
return error in POST api/v1/location_machine_xrefs_controller when location_id or machine_id is null
Merge branch 'enhancements'