Updated for express 3.x & openmrsid 2.0
Removed vline/opensocial experiment
Compliance with felixge's styleguide
Merge remote-tracking branch 'upstream/master'