merge feature/bigcommerce into feature/rails3

merge fixes from feature branch into rails3 branch.

feature/rails3 will be merged to master