Increase VM memory to 1GB
Initial commit
Ubuntu 14.04
Merge branch 'ubuntu-14.04' of github-mwoodbri:mwoodbri/vagrant-xnat into ubuntu-14.04

Conflicts:
	install-xnat.sh