initial import
updates
Merge branch 'master' of https://github.com/rnowling/bdse2015_paper