Checkout upgrades
Merge branch 'master' of github.com:chrislynch/engine4