Set up machine specific config and updated README
Merge branch 'master' of github.com:neontribe/Linked_Development

Conflicts:
	README.md