Code fixes
Updating code. Cleaning it up
Merge branch 'master' of https://github.com/bldr-io/bldr

* 'master' of https://github.com/bldr-io/bldr:
  Update README.md
  Update README.md
  Update README.md