update prices format
fix number of cores on 4xlarge
Merge branch 'master' of github.com:NREL/OpenStudio-aws-gem

Conflicts:
	doc/amazon_prices.xlsx