Simplifies how masks are re-formatted and allows for more advanced masks
Merge pull request #206 from sudorandom/master

Simplifies how masks are re-formatted and allows for more advanced masks
Refines and extends active transaction info (see notes)

- Non-TTY output no longer provides a transaction's friendlyName (i.e,
  "Power on server"), which may have spaces, instead resorting to the
  transaction name (i.e., "POWER_ON"). Normal TTY output retains the
  friendlyName.
- Adds a formatting helper for objects that may have an activeTransaction
- Existing CCI list uses new helper
- Hardware lists now include the active transaction, if any
- Hardware details and CCI detail output now includes the active
  transaction, if any
Update server tests to yield 100% coverage on new transaction code.
Merge pull request #207 from briancline/hardware-txns

Refine and extend active transaction info for CCIs and hardware servers