Cleanup for server
Merge branch 'master' of https://github.com/mostly-harmless/radyant

Conflicts:
	inst/finance/global.R
	inst/finance/server.R
	inst/finance/tools_enabled/garch.R
	inst/marketing/global.R
	inst/marketing/radyant.R
	inst/marketing/ui.R
	inst/marketing/www/navbar.html