FIX: travis testing

Another attempt to make travis happy. Please don't merge yet.