Prepare to pull from master.  Working on adding functionality to VelocityScript