Removed all traces of watch-puppy, changed manual building to csmake scripts where possible'