PSR compliance, removed demo bundle.
Fixed conflict left behind...
Merge pull request #1 from SeerUK/master

PSR Compliance, Removed Demo Bundle, and Fixed Leftover Conflict