Initial commit
Had a project path screwed up
Some other project changes too...just for fun
various things....
Merge branch 'master' of https://github.com/caseykramer/Plexus

Conflicts:
	.gitignore