Looks like some changes that never got commited for issue #17 in regards to -WShadow
Merge branch 'develop' of github.com:USCiLab/cereal into develop

Conflicts:
	include/cereal/cereal.hpp
	include/cereal/details/helpers.hpp