Rough Jarvis2 added
Rough CF2
Merge branch 'master' of https://github.com/ptwiddle/Pingree2014-GW