remove accidental file committed
adjustment of conditionals in get_sites_devices_status and test cleanup
Merge pull request #1164 from ifreecarve/2013-06-04_test_observatory_management

test observatory management fixes