Merge pull request #150 from mikewalch/spark161

Upgrade spark to 1.6.1