Work on bs3 a bit
Merge branch 'bs3' of github.com:calzoneman/sync into bs3