Merge pull request #1 from ncss-2014-group-3/master

Merge
Merge pull request #2 from ncss-2014-group-3/master

Merge
Increased standards compliance
Fixed error message for no users.

Also increased standards compliance.
Revert "Far nicer"

This reverts commit 7e35d092998e450e4cc87a23169e6ed5f50c1a96.
Merge pull request #34 from nhardy/master

Some fixes for minor issues.