Merge branch 'master' into save-public-keys

README.md

cmd/cashierd/main.go

server/auth/gitlab/gitlab.go

server/auth/gitlab/gitlab_test.go

server/config/config.go

server/config/config_test.go

server/config/testdata/config.go

server/config/testdata/empty.config

server/config/testdata/test.config

vendor/github.com/hashicorp/hcl/hcl/parser/parser.go

vendor/github.com/homemade/scl/LICENSE

vendor/github.com/homemade/scl/decode.go

vendor/github.com/homemade/scl/disk_file_system.go

vendor/github.com/homemade/scl/doc.go

vendor/github.com/homemade/scl/file_system.go

vendor/github.com/homemade/scl/glide.lock

vendor/github.com/homemade/scl/glide.yaml

vendor/github.com/homemade/scl/parser.go

vendor/github.com/homemade/scl/readme.markdown

vendor/github.com/homemade/scl/scanner.go