guard for running rspec
Merge branch 'master' into lon_lat_coreutils

Conflicts:
	spec/broadcast_spec.rb