removed hardcoded passwords
Merge branch 'BashoRiak148' of /Users/jglick/Documents/Development/clients/201211-Microsoft/imagemaker

Conflicts:
	.gitignore
Removed hardcoded info