Added config_remote
Removed extraneous line
Merge branch 'master' of https://github.com/gunchleoc/ginbeag.git

Conflicts:
	.gitignore