Add pip-tools

Rename files to make more pip tools friendly and add pip-tools as make
targets.
Merge branch 'feature/pip-tools'