simplified aws instance config
Merge branch 'master' of github.com:kenny13/elasticsearch