Cleanup for travis build

Also had current map emit with change.