Merge pull request #297 from jivedesign/elasticSearchDev-josh

Elastic search dev josh
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into elasticSearchDev
Merge branch 'elasticSearchDev' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into elasticSearchDev
a few tweaks and added connectivity checks
Merge pull request #310 from tbrockman/elasticSearchDev

a few tweaks and added connectivity checks