make env configurable
Merge branch 'develop' of tapir.github.com:intrigueio/tapir into develop