CLOUDIFY-2340 apply flake8 needed changes to code
CLOUDIFY-2340 install flake8
Merge pull request #6 from CloudifySource/feature/CLOUDIFY-2340-flake8

Apply flake8 changes to riemann configurer project
CLOUDIFY-2421 pass app name when building riemann configuration
Merge pull request #7 from CloudifySource/feature/CLOUDIFY-2421-node-name

pass app name when building riemann configuration
CLOUDIFY-2426 add node_id as service property to node rules
CLOUDIFY-2426 only add service if needed
Merge pull request #8 from CloudifySource/feature/feature/CLOUDIFY-2426-simplify-policies

Simplify policies
Merge branch 'develop' into feature/CLOUDIFY-2370-plugins-as-python-libs

Conflicts:
	riemann_config_loader/tasks.py