Merge branch 'master' of https://github.com/marineb/smallbizdev into she...

...ldon-graph