Merge pull request #1 from capomastro/master

Merge forward
Couple of minor tweaks to the admin.
Merge pull request #49 from bigkevmcd/master

Couple of minor improvements to the admin.