added branch.sh
updated .gitignore
Merge branch 'master' of github.com:opensciencegrid/oim

Conflicts:
	.gitignore
removing context.xml
Merge branch 'master' of github.com:opensciencegrid/oim