Merge pull request #96 from jamesyothers/master

formatted configuration files for Android development