Fixed issue with canonical edge partitioner.
Merge branch 'cleanup'
Merge branch 'master' of github.com:amplab/graphx
Added logging to Graph, GraphLab, and Pregel.
Merge branch 'master' of github.com:amplab/graphx
Merge branch 'master' of github.com:amplab/graphx
Merge branch 'master' of github.com:amplab/graphx
Fixed merge conflicts.
Removed slaves from git
Merge branch 'master' of https://github.com/amplab/graphx
Added conf file to gitignore.