Merge pull request #15 from medullan/develop

Develop
Merge pull request #16 from medullan/develop

update readme with development rules
Merge pull request #17 from medullan/develop

add config blocks in vagrant file
Merge pull request #18 from medullan/develop

update readme with config blocks
Merge pull request #19 from medullan/develop

Develop
Update README.md
Update README.md
Merge pull request #20 from medullan/master

merge latest into develop