code cleanup

- indents and removed a couple commented-out bits.

Signed-off-by: William Rockwood <wrockwood@tadl.org>
Merge branch 'master' of github.com:tadl/tadlmobile-android

Conflicts:
	assets/www/js/main.js

Fixed up my previous commit and merged into master

Signed-off-by: William Rockwood <wrockwood@tadl.org>