Merge feature/rails3 and feature/bigcommerce back down to master

Merged feature/bigcommerce into feature/rails3
Merged feature/rails3 into master