Add conf
Merge branch 'dev' of https://github.com/tqchen/xgboost into dev