oh, css. you dog you.
Merge remote-tracking branch 'origin/master'
partial fix for issue #2.  user_prefs now creates an entry if one does not exist in the user_pref table.