Minor code cleanup.
Added Travis-CI integration