Let's get this party started
Merge branch 'master' of github.com:yetanalytics/hoser

Conflicts:
	LICENSE