Merge pull request #2 from mredar/master

Solr ec2 dev box provisioning
Let ec2-user write to log...
Create ucldc-operator-keys.txt

let operators in to AWS test instances
make set -x only on debug....
local host file for Ansible
switching back to binary style java rather than pkgsrc packages
stub READMEs
This seems to be running fine
upgrade from set -eu

if [[ -n "$DEBUG" ]]; then
remove redundant command
more nuance to java detection
manual merge branch 'master' of https://github.com/mredar/appstrap

Conflicts:
	ec2/base_user_data.sh
	ec2/launch-nuxeo-dev.sh
git told me this file had been "removed by both of us"
Merge remote-tracking branch 'upstream/master'
Move base-user-data.sh template to user-data dir.
Remove unused code.
Trying to make ansible run locally.