Working base code for downloading and munging data: U.S. electricity generation by state and month from 1973, and international data 1980 - 2012 (2011 for consumption).
Merge branch 'master' of github.com:tomhopper/eiaelectricityr

Conflicts:
	.gitignore
Merge branch 'master' of github.com:tomhopper/eiaelectricityr

Conflicts:
	.gitignore