ec2 - Updating for infra changes
Fix for ec2 region
Merge pull request #207 from psav/ec2_region_fix

Fix for ec2 region
Add flake8 to requirements
Sort requirements
Merge pull request #208 from seandst/flake8-requirements

Add flake8 to requirements
Bypass unexpected popup in server_roles

(cherry picked from commit f9ebb918840cebddc103178d539f1b35d5aa0e9b)
This commit was lost in the merge of #172, my apologies
Merge pull request #182 from rlandy/retirement_tests

ec2 provisioning test
Merge branch 'master' into refactor

Conflicts:
	requirements.txt
Navigation now allows grafting idempotence

* Reimplemented using dicts instead of lists (easier to merge)
* Still work in progress on cloud provider class