Pull settings in to master

then trash master