Update upstream B/CB/S

Remove two features added upstream
This commit is contained in:
Zach Brown
2016-08-27 18:41:58 -05:00
parent a9481ee3c7
commit fcbbc76319
14 changed files with 29 additions and 697 deletions