add desktop_notify flag to users
Desktop notifications for samson
Merge remote-tracking branch 'origin/master' into ben/desktop_notifications

Conflicts:
	db/schema.rb
undo the schema limit changes
put in the ridiculously small favicon.  perhaps a designer will take pity on me.
Merge pull request #101 from zendesk/ben/desktop_notifications

Desktop notifications for samson