Site fixes

Various fixed so the site is back to a deployable state
Not sure how i am supposed to then fix this.. Guess this is something we should write an issue for at puphpet?