update instructions for cloning existing repos
fix merge conflict
change base to blueprint
change references to base to references to blueprint
Merge pull request #151 from hbillings/0.9-beta5

Change 'base' to 'blueprint'
wip making _blueprint stuff work
work out kinks in handling both blueprint and base conventions in main tarbellsite object
handle both blueprint naming conventions in cli.py
add upgrade instructions
fix merge conflicts
ya big dummy