Addition of Travis build-badge, cleanup