Merge branch 'fixing-tests' of git://github.com/Adam89/fourth_meal into adam
Merge branch 'master' into adam
adam's address changes