Intermidiate
Merge branch 'master' of http://github.com/cgentry/gus

Conflicts:
	service/hmac.go
	service/service_test.go