testing docker options
docker: java and irods work (with the right pass)
maven: pack javadocs and sources in war
typo and name fixes
no tomcat needed on VM, we'll use local
dockerfile update
Merge branch 'docker'

Conflicts:
	vagrant/Vagrantfile
	vagrant/irods.sh