local commit
fix conflict
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Improvements to VagrantFile
Improvements to VagrantFile
Updated with Github instructions
Update README.md
Update README.md
Merge remote-tracking branch 'XTUPLE/master'
Added postgres access rule to provisioning script
Update README.md
Update README.md
Merge pull request #11 from lynnaloo/master

Issue #22891 - Added postgres access rule to dev provisioner
Update README.
Merge pull request #12 from bendiy/master

Update README.
Update README.
Merge pull request #13 from bendiy/4_4_x

4 4 x
Merge remote-tracking branch 'XTUPLE/master'
Merge pull request #14 from xtuple/4_4_x

Merge 4_4_x into 4_5_x