2.1.0

Updated Oct 11, 2018
  

Stuff needed before 2.1 is ready