Changed setup.sql to include drop/create movieserver database statements. Also made the heartbeat cleanup wait for its tasks to finish before returning, so that it actually cleaned them up. Also reordered a function in sql_interface.go