updated guard
moved things to macking-sphinx
cosmetics
fixed context specs
fixed truecased