Update README.md
Update AndroidManifest.xml
Format code and simplify some logic
Merge pull request #2 from firekesti/master

Clean things up a little