Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:chosegood/profanity
Added resource.c
Renamed contact property jid->barejid
Changed parameter to contact_list_add jid->barejid
Added default resource to contact
Fixed error clearing contact list
Only create contacts resource when online
Renamed jabber_presence_t->presence_t
Added presence string functions to common
Added resource_presence_t
Renamed resources->available_resources
Removed presence from jabber_conn
Added resource_presence_t and contact_presence_t
Use resource_presence_t in Resource
Added p_contact_add_resource
Added usage of handlers to message and presence modules
Tidy up presence module
Simple default resource hanlding on presence
Removed whitespace