updated smoke/application.conf
remove old code pieces
updated ocr, disabled feature-analysis.py
test for grounding multiple variables
Merge pull request #107 from feiranwang/develop

Develop
Merge branch 'develop' of github.com:dennybritz/deepdive into develop
Add readme for multinomial
revert log to info
default cardinality for boolean vars
updated smoke
update smoke, needs testing
updated ocr and smoke
Merge pull request #109 from feiranwang/develop

Develop
Merge branch 'develop' of github.com:dennybritz/deepdive into develop
add new sampler