moving from old repo
Merge branch 'master' of github.com:bsautner/com.nimbits
Merge branch 'master' into move