jvlomax/Beaker-bot — pull request #5 by Knudah (2014-09-15 15:12:54+00:00)
Title: SuggestMovie, Weather and Pornquote plugin 

Removed the last two pull request since they were not up to date with master.

Weather plugin now reports back if the city was not found.
Pornquote plugin will now always return a comment.
Added a new plugin SuggestMovie which returns a random movie (title, year and a youtube link to a trailer)

The merge conflicts have been sorted out.