Update pull.sh to better pull
Update Cappuccino
Merge branch 'master' into some-xen-related-fixes