- Added --custom_attributes option (not implemented yet)
- simplified query statement in get_data()
- implemented _mergedata function to merge custom attributes into ndata so the jinja template will render it without changes
- documented use in README
Merge branch 'master' of github.com:favoretti/puppetdb-external-naginator

Conflicts:
	naginator.py
Merge pull request #11 from reinoud/master

Custom attributes