Add the ability to add tags to an elasticsearch instance

The tags key is taken from the instance and each entry appended to the
already existing tags variable
Fix TypeError('NoneType') if tags is not set in configuration