stop being mean to me lint! fine! i'll fix the parts I care about
Merge branch 'master' of https://github.com/motherjones/syria_lean