requirements.txt is now a basic requirements file so that different files can extend from it for different situations

fixes SPOT-916
Merge branch 'master' into uiuc_merge