Change to match Brian's stacks
Update for aws 1.1.2
Merge branch 'master' of https://github.com/mredar/appstrap

Conflicts:
	stacks/solr.pkgsrc.txt
Wrap more in stack as Brian does.

Needed changes to have more fine grained install on various platforms and
role accoutns