don't need to set current anymore?
Merge branch 'master' of git://github.com/CCETC/DirectoryBundle