added airbrake.environment as conf variable
Merge branch 'master' into scm-version