Several fixes and additions
Merge pull request #7 from cPanelChrisD/master

Several fixes and additions.  reviewed: davelcpanelnet 10022014