measure working mostly
minor clean up
Merge branch 'MayRelease' of https://github.com/RareCrowds/OpenAdStack into MayRelease