Merge pull request #247 from jjhuff/master

Make local-up-cluster.sh more user-friendly