Fix merge issues
Merge branch 'develop' of https://github.com/InMobi/grill into merge-0.13
Merge pull request #18 from InMobi/merge-0.13

Merge 0.13 issues