added columns: country and search_word to tweet table
Added and updated doc strings.
getTweets now returns list of dictionaries instead of lists of tuples added columns/keys search_word, search_country. Added and updated doc strings.
Merge branch 'master' of https://github.com/freko247/conflictMapping