secure tokens, take 2
Merge branch 'travis' into develop