consolidate all input functions into inputModule.py
Merge branch 'master' of https://github.com/cdepatie/uoguelph
slight modification to remove redundancy between parseInputString and parseFunction