Merge branch 'master' of github.com:uwescience/kbmod

Conflicts:
	.gitignore
	NOTES.aws
Second attempt to remove .bz2 files
Merge branch 'master' of github.com:uwescience/kbmod