just histories, no packets
z3 examples
merge in cleanup changes
partial re-application of airplane changes
Added back in pushbutton testing
Added back in pushbutton testing
Merge branch 'master' into before_enable_disable

most of the changes from master have been re-created in this branch.
changed verify file format (netkat program belongs in separate file)