removed some cruft, moved travis to test