Preparation for generating scripts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add pyon-admin as a console_script, so it can be called from anywhere.