Install PIP using the Ubuntu APT repo instead of Easy Install
Merge branch 'master' into development