Fix comments. Add timeout to integration test; don't make travis run for 15 minutes any more.