remove automatic scales
Merge branch 'master' into type

Conflicts:
	example/gmm/gmm_proposal.hpp
	example/include/options.cpp
	example/pet/pet-smc.cpp
	example/pet/pet_proposal.hpp