Fixes build and adds travis support