builtins now show up in function definitions
fix linting bug
Merge branch 'builtins-fix' into develop