Guidelines additions and Travis fix.