rewrite to use ip-location library lookups
foodcritic
tidy up templating
resolve merge conflict
fix template after merge conflict
get ec2 creds in a different way
Merge pull request #27 from mancdaz/master

Merged automatically by jenkins after successful build test