Fresh start with code updates

Check in Allison's code, then update to code from old computer (known to
work on this rig)
Code from previous computer
Remove old code

Now creating master branch
Merge remote-tracking branch 'origin/master' into dev
nothing much

blah