Added some base attributes and recipes
Merged in changes and fixed logstash recipe