Fix docblock
Merge branch 'master' of github.com:polyfractal/athletic
Add travis