Add windtunnel_resources.txt file of Google Fusion table locations.
Change chart to display yearly budget data for subsonic tests, by user.  Also ignore temp files.
Fix for merge.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	windtunnels/public/chart.html~