Merge branch 'master' into errors

Conflicts:
	testing/rest_mux/rest_mux.go
Add note about easyconf disabled
Merge branch 'errors' of github.com:rafaeljusto/shelter into errors
Begin structuring a better protocol message

See #100