Rebase me away -- removing failing travis test