Remove trailing whitespace.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Remove useless non-greedy modifier.

Perl 5.20 warns about this.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>