Pulling from HG
Merge branch 'master' of github.com:spmadden/rit-betterclaws