Commit to merge old
Merge branch 'master' of https://github.com/philleonard/graphlab

Conflicts:
	toolkits/graph_analytics/advanced_coloring.cpp.old