Cleanup

Code cleanup to suppress Android Lint warnings. Resolved conflicts with other previous commits in .gitignore and, I think, finally understood the difference between forking and branching in github.