Version bump. Also remove double underscores in include guards.