updated for new version of git and node status
Merge branch 'master' of github.com:nangus/configs