better parsing of graph text files
Merged with master

Merge branch 'graph' of https://github.com/rxin/spark into graph