addresses. also bugfix
Merge branch 'master' of https://github.com/OWOW/negev

Conflicts:
	off market/casperjs/sf_info.js