Merge pull request #42 from robparrott/master

Merge in consolidated fixes from Rob's branch
allow for private ELB