Merge pull request #41 from wfrench/master

New Watch Log Script
adjusted the data particle types to be more accurate
Merge pull request #42 from wbollenbacher/master

VEL3D & VELPT: update data particle types to be consistant
fixed a total noob error i made forgetting to convert python string to int before testing for existance in an array.
port modification to remove conflicts so Jamie can run bin/test_driver -b
Added ability to have different types of param dict values
Fixed a set_init_params regression test
Merge remote-tracking branch 'upstream/master'