MIL-245 cleanup
Merge branch 'master' of https://github.com/crdschurch/crossroads.net