first commit, take 2
Merge branch 'master' of github.com:rlangford/bps