Deploy merge!

Functional, needs better docs.. but welcome to the master patchoo deploy!