Merge pull request #248 from RandolfCarter/master

Remove end trailing whitespace (and ?>) to prevent starting output
Remove ?> at file ends to prevent premature outpout
Merge remote-tracking branch 'github/master'