Added ability to enforce two-part names delimited by -

Hello eford, 

Please review the following commits I made in branch 'jeremy-enforceNames'.

cd377aeea6d30292f55a2b1cff7704ef2d2a1761 (2013-01-04 15:53:50 -0800)
Adding ability to enforce two-part names

R=eford