[Vivian/Asif/Michael] tested the updating of PersonAttributeType
Changed merge jsp to display program name
Merge pull request #21 from msvivianso/master

[Vivian/Asif/Michael] tested the updating of PersonAttributeType
Merge pull request #22 from spwntr/master

ThoughtWorks Chicago CodeJam and Friday afternoon refactoring with a bug fix.
Merge pull request #23 from mlennon3/master

Ayanga & Michael | Changed merge jsp to display program name
Refactored the two test classes into one
Merge pull request #24 from mlennon3/test-rename

Michael | Tech Debt | Refactored the two test classes into one
Steve & Alberto | Add vagrant box to developer environment for running the openmrs-standalone with data.