Removed old ResourceLoader
Added ternary operator, fixed some misc bugs
Merge branch 'master' of https://github.com/mbosecke/pebble