Clean up rules after sandbox deploy
Branched off of 20130301 commit
Merge branch 'master' into asynch
rid and test cleanup
Module caching change via pjw
Merge branch 'asynch'
removed module rid from cachable