Fix merge error in spreadsheetimport.py
Merge branch 'master' into jmu-production