Synchronize configs with 2.0.x

This commit is contained in:
Scott Lahteine 2017-12-30 21:53:56 -06:00
parent 1e18d716c2
commit 839dd66c3b
73 changed files with 423 additions and 727 deletions