refactor all the codez
Merge branch 'master' into better_yaml
Merge pull request #5 from csmalin/better_yaml

Better yaml