fix now today, try to think how to work tmr
Merge branch 'unity' of ssh://github.com/tqchen/xgboost into unity

Conflicts:
	src/learner/evaluation-inl.hpp