Merge pull request #15 from brabbins/master

updates to clf for ubc clf 7.04 update