An attempt to make the yaml handling work correctly - travis showed it's not bullet proof yet