Whitespace and indenting fixups
add package component to rewrite rule
also add the 'package' target to $ make info output
Merge pull request #293 from tamiko/miscellaneous_fixups

Miscellaneous fixups