Merge pull request #21 from kamaradclimber/master

Update to kibana3
Suggest nginx 2.5.0