add apache, bundler, git, kibana3, ruby modules. all needed for kibana3 support
- refactor out some include's for easier hiera use for logstash
- update some comments
- add kibana3 support