Update Travis file
Code cleanup
Don't track lockfile
Update CHANGELOG
More code tweaks