updated jbuilder gem to 2.2.0
Merge branch 'master' of github.com:Kosmas/conductor
added config/secrets.yml to ignore list
updated schema with latest migrations