Merge pull request #1 from grouplens/master

sync with grouplens/lenskit