commenting out stuff which takes a long time
Merge branch 'master' of github.com:dxw/rsparly2013