Update pip prior to distribute
Merge pull request #23 from bkg/pipupdate

Fix updating of pip and distribute in virtualenv
Fixed variable access deprecation warnings in ERB templates.
Merge pull request #24 from yangjuven/var-access-patch

Fixed variable access deprecation warnings in ERB templates.