Adding cache to ignore
Merge branch 'master' of github.com:losalamos/CLAMR
Merging in build changes

Conflicts:
	.gitignore