Merge remote branch 'upstream/master'
Merge remote branch 'zen/master'
Adding configs for integration testing
Merge pull request #21 from RiteshMaheshwari/master

Adding configs for integration testing

lgtm