Improve requirements.txt parsing to accomodate other options