Changed rebuild script to use git reset --hard, which won't fail with local changes.
Merge branch 'master' of github.com:/auntieNeo/nixrc