ReloadConfig now reusable.
added copyright to top of file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/config.go

Merged from 1f3f12add7e6c2e2bbc77fc3f0b8367a3d2a68fc and
91b2e9aca4a96e6dcdfa138feb9b3fb7ab63f3e4.