PSR Compliance, Removed Demo Bundle, and Fixed Leftover Conflict

One note of seriously great importance, putting your curly braces on new lines, fair enough :P, but NEVER end a PHP file with a closing PHP tag if it doesn't need one, if can cause serious problems. 

Also, make sure your editor is set to trim trailing white space, because that in combination with my last point can also cause very, very serious problems that are hard to track down sometimes.

Enjoy.