Remove before script in Travis conf
Remove habitat to make things a little easier. Fix tests