Big commit.  I moved a lot of the data around.  Need to fix onceler cmd
line test and also test race conditions.  (Jasmine executes tests in
parallel)