Merge branch 'refs/heads/master' into reorg

Conflicts:
	.gitignore
Moved the project into it's own folder
Made it an eclipse project
Ignored all bins
Merge branch 'refs/heads/reorg' into listeners

Conflicts:
	.gitignore