Merge pull request #1 from guahanweb/develop

Merging working defaults in to master
Updating README with license and Bitdeli badge