Merge pull request #2 from jwilsson/master

Small admin changes
Code style fixes