Make setup.sh a bit more intelligent and able to setup more of ~. Remove the patch script, got in by accident.