local.properties shouldn't be in VCS. Cleanup for Travis
Merge branch 'master' of https://github.com/indrora/Atomic