Changes since integration

Highlights:
* README updated with latest instructions
* Default to analytics.properties if none found
* Fixed property loading/wildcarding a bit - was causing some issues
* Fixed lots of formatting - got rid of all tabs, now doing 2 spaces