Merge pull request #1 from david-matheson/colrf-icml2013

Merge build fixes