+ cancan, active merchant, database test settings for travis
Merge branch 'master' of https://github.com/dex157/payment_gateway