Remove our hackish Shib code and use a proper module
Some tweeks to get shib working