Refactored stats

I realized this uses settings which are unique to each google api
account
Minor refactoring
User account fixes
build update
Merge pull request #4 from mlantz/dev

Dev to master