Clean up DRF support

Use compiled regex
Remove trailing commas
Don't use single line if statements
Add api/ to setup.py packages