Making EC2/AWS settings more generic
Merge branch 'master' of github.com:ironfroggy/myshell

Conflicts:
	bashrc