Merge branch '2076-check-config-at-boot'
authorTom Clegg <tom@curoverse.com>
Mon, 10 Mar 2014 20:09:04 +0000 (16:09 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 10 Mar 2014 20:09:04 +0000 (16:09 -0400)
closes #2076


Trivial merge