Makefile: Change 'setup' to 'install', include pip an dvirtual
Makefile: Add new 'setup'
Makefile: Add new 'clean'
Makefile: Change 'run' to 'web'
Makefile: Add new 'run'
README: Remove 'Setup' section, use makefile in Install
Fix conflicts for master and makefile branches