i messed something up with vi
Merge pull request #46 from jrogelstad/19735

trying out John's pull
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
Merge pull request #47 from jrogelstad/19827

19827
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
Merge pull request #48 from jrogelstad/19807

19807
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
Merge branch 'xtuple'
Merge pull request #49 from jrogelstad/19827

19827
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
fix merge conflict
fix merge conflict
moved contact test back to models directory
moved contact out of wip
Merge pull request #51 from xtuple/master

catching up
Merge pull request #194 from mikerodonnell89/master

moved contact back to models directory