Prevent travis from killing me
Merge /home/jpic/env/src/cities-light