Better default test, removing common defer function
New defer helper
Merge branch 'master' into bookshelf
Test for Common.defer
Merge branch 'master' into bookshelf