solve MAP label confusion
Merge branch 'dev' of https://github.com/tqchen/xgboost into dev

Conflicts:
	regrank/xgboost_regrank_obj.hpp
polish ndcg
minor change
ok
fix
change rank demo data set
small change
change the rank data set to MSLR-WEB30K
Merge branch 'master' of ssh://github.com/tqchen/xgboost into dev
Merge branch 'master' into dev
Add in rank demo
Merge branch 'master' into dev
add cache pointer to dmatrix
Merge branch 'dev' of https://github.com/tqchen/xgboost into dev
small change
remove conf from git ignore
Got OpemMP working on Windows
Merge branch 'dev' of git@github.com:peterwilliams97/xgboost.git

# By tqchen (6) and others
# Via tqchen (4) and others
* 'dev' of git@github.com:peterwilliams97/xgboost.git:
  remove conf from git ignore
  small change
  add cache pointer to dmatrix
  Add in rank demo
  change the rank data set to MSLR-WEB30K
  small change
  change rank demo data set
  fix
  ok
  minor change
  polish ndcg
  solve MAP label confusion

Conflicts:
	python/xgboost_python.cpp
	regrank/xgboost_regrank_eval.h

Signed-off-by: Peter <peter.williams.97@gmail.com>
...