Update README.md
moved lots of things around to make configuration simpler.  Attemps were made to keep 100% backward compatilibilty, but I may not have been successful.

Added simpler YogaBuilder configuration process
Merge remote-tracking branch 'upstream/master'