Updating configs
Merge branch '20140813033358590'

Conflicts:
	.gitignore