Testing modified settings for repo + updating NomadicAgent
Merge branch 'master' of https://github.com/gidzzz/hairy-octo-avenger

Conflicts:
	.gitignore
Minor issues..