Merge pull request #2 from codemiller/master

Updating scripts to ensure Ruby 1.9.3 on path and adding .openshift template dir
remove lsof usage
Merge pull request #7 from bparees/master

remove lsof usage
Merge remote-tracking branch 'upstream/master'

Conflicts:
  metadata/manifest.yml
sync upstream