Merge branch 'master' into graph_items_from_hosts

Conflicts:
	providers/trigger.rb
Merge branch 'master' into graph_items_from_hosts
Merge pull request #34 from RiotGames/graph_items_from_hosts

Graph items from hosts
Merge branch 'master' into failsafe