more portable sed syntax
Tweak portable sed syntax

Use options that work on both Ubuntu and OS X.
Specify a suffix for the backup files created
by inline editing, and delete the backup files
before creating the JAR file.
Merge branch 'kmcminn-master'