easy_install yaml fails, so installing pyyaml instead
Merge pull request #113 from shatterednirvana/easy-install-pyyaml

easy_install yaml fails, so installing pyyaml instead