Lots of small changes and hacky things
Added myproxy models to support storing of certificates