Remove backup files
Fix duplicate line
Remove deprecated files
Fix uninitiated variables
Merge pull request #5 from timschofield/master

Updates for php 5.4