Merge pull request #1 from AnnaGerber/master

UI fixes and check that user preference data exists before using
Add a Bitdeli badge to README
Merge pull request #2 from bitdeli-chef/master

Add a Bitdeli Badge to README