Feature: changed server_tag default to puppet environment
Added .lock to gitignore list