Merge pull request #61 from haberman/csv

Added option for CSV output.