Merge pull request #1 from aeoliant/master

alex is here
Pinged MovieBot
Merge pull request #2 from aeoliant/master

accept or die
Add stuff so Alex doesn't cry
Merge branch 'master' of github.com:weirdcanada/moviebot