Suggested fix for issue #334

In order to support automatically taking any block device mapping of an AMI into an ASG they can be taken from the image itself. Any default EBS volumes on the AMI will be mounted as usual. 

This solves the issue we've been having with asgard not mounting the ephemeral disks in the AMI
Preserve the old signature for backwards compability
Fixed style
Update AwsAutoScalingService.groovy
Surpress errors for trailing whitespace
Merge config with those on ami

Gives presedence for those in the configuration
Added tests for merge
Removed a tab
Removed a tab
Merge pull request #589 from OskarKjellin/patch-1

Suggested fix for issue #334