Merge pull request #5 from robparrott/master

Big refactoring!
Merge branch 'master' of github.com:huit/AWS-HA-Drupal