missing import
updates
rm conflict marker
store-features -> paper-plots
udpate variable binning
update paper plotting script
Merge pull request #46 from ndawe/master

MRG: paper plots