Updates to codebook based on changes to variable names made on 8/18/14
Corrections to dataset variable names/types in codebook.md

Merge branch 'master' of github.com:billcary/coursera_getting_and_cleaning_data_course_project

Conflicts:
	codebook.md