+ fix ContactTest by ensuring person fixture loaded
+ reformatting of ContactTest code for psr3
Merge branch 'release/1.6' of github.com:openeyes/OpenEyes into release/1.6