Merge branch 'develop'
Merge branch 'develop'
Merge pull request #72 from r8/develop

Update Mailcatcher info in README, close #65
Allow Apache include files through the data_bags json files