Add file_recv option to config file template
Add missing master configuration file parameters

This commit adds some recently-added master config options to the online
docs.
correct inaccuracy in cp.push docstring
pep8
Add default value for file_recv master config option.

This prevents a traceback on the master when a minion runs cp.push and
no file_recv parameter is configured.
Merge pull request #6579 from terminalmage/develop

Fix traceback on master when cp.push is used without file_recv being set