Add compile-time configuration of server and authentication type.
Add the config template.
Fix typo.
Merge branch 'master' of https://github.com/kbase/assembly into ff
Merge branch 'master' into ff

Conflicts:
	tools/add-comp.pl
Merge pull request #257 from olsonanl/master

Release engineering changes
Merge branch 'kbase' into kbase-dev
minor update
Merge pull request #258 from kbase/ff

release engineering