Add make and other utils
Update with virtualenv support
Merge branch 'utils'