Pushed repo to OpenMRS org

added nodeJS
Updated instructions

Location of omod files. Instructions to resolve some issues involved
(mostly in Windows)
Merge pull request #10 from thewheat/master

Updated instructions based on some issues from newbie night
Daniel - Configured vagrant to start on vagrant up

Added 'export DISPLAY=:1 to bashrc'
Configured vagrant to startup on display :1
Merge remote-tracking branch 'upstream/master' into firefox-xvfb
Merge pull request #1 from dtong2/firefox-xvfb

Adding firefox & xvfb
Adding in grunt, nodejs, bower

These puppet configurations came from the USB stick that had unsynced
changes.
Update README.md

use "vagrant up --provision"
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-vagrant

Conflicts:
	modules/xvfb/manifests/init.pp