Bugfix reg check

Addresses issues #216 and #302, plus a separate issue where vagrant wouldn't work using a samba share.