cleaning out some superfluous comments and adding a basic settings activity.
Merge remote-tracking branch 'origin/master'