Merge pull request #42 from vinhboy/master

fix about us
fix rebase problem
Merge branch 'master' of https://github.com/droulette/giftminer
capybara js removal
stripe controller update, change thank you email, change form layout in edit and stripe from