Add travis-ci status
Some code cleanups