Improves upon/fixes idris-lang/Idris-dev#530
Merge branch 'feature/simplifiedparsing' of https://github.com/ahmadsalim/Idris-dev into ahmadsalim-feature/simplifiedparsing