I promise to clean this up....
Merge branch 'master' of https://github.com/arothmel/gp6pei

Conflicts:
	README.md
Merge branch 'master' of https://github.com/arothmel/gp6pei

Conflicts:
	README.md