Naming fixes. Added Travis.