Change import.
Merge branch 'master' of https://github.com/alexandrebouchard/conifer
Fix some import statement that broke during merging
Update briefj dependency version number
Merge branch 'master' of https://github.com/alexandrebouchard/conifer