working around safe_yaml dependency issue https://github.com/dtao/safe_yaml/issues/43
Merge branch 'develop' of github.com:Tout/trubl into develop