rework directories
new AMIs work
Merge pull request #560 from NREL/osserver-cleanup

rework directories
Merge remote-tracking branch 'remotes/origin/develop' into PAT-EC2