Updating to plosthes.2014-3
Updating license statement
Merge branch 'master' into to-json