Added bedrock and ore update.
Ignoring update.
adding a few more to the ignore list.
Merge branch 'master' of https://github.com/trichner/Metropolis

Conflicts:
	.idea/workspace.xml