fixed upstart. added virtualinv activation
Merge branch 'develop'