Minor cleanups / Travis update