travis config
fixed little things
Merge branch 'travis'