Merge pull request #31 from tqchen/unity

Change master branch into unity
Update mushroom.conf
Update mq2008.conf
Update machine.conf
Merge pull request #32 from tqchen/master

merge master into unity