Merge pull request #1 from jrp6/master

vidplay: Allow specifying preferred player
Changed location of vidplay config, removed old crud and switched to tabs for indent in vidplay
Made fbb also configurable
Fixed a typo in README
Improved and simplified fbb and vidplay
Merge pull request #1 from JuEeHa/master

Merge from upstream