Rework manager.py, get rid of Makefile clutter
Fix travis