added autotest testing to test_ami
changed spacing in ssh config
added etcd test to suite
added autotest cleanup code
Merge branch 'master' of github.com:doodles526/scripts

Conflicts:
	oem/ami/test_ami.sh