Added a few new replacement types
Merge branch 'dev' of github.com:splunk/eventgen into dev