changed prepare_deploy.py to use choices idiom in argparse
add -n option to prepare_deploy
Merge pull request #6 from eteq/overhaul-setup

Adjustments/ehancements in prepare_deploy.py