Merge commit 'refs/pull/96/head' of https://github.com/asascience-open/ncSOS
Updates to address defects found in the Dec. 2013 test report
Merge branch 'master' of github.com:asascience-open/ncSOS