Merge branch 'bug6-search'
Merge remote-tracking branch 'upstream/master'
Adjusted contributing.rst with link to travis + new feature and thoughts
about ocr.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into contrib-updates
Merge pull request #44 from erickr/contrib-updates

Updated to docs/contributing.rst