Update vpim gem
Fix survey mode error for Ruby 2.0
Merge pull request #130 from CruGlobal/MH-668

Fix survey mode error for Ruby 2.0
Fix sass conflicts
Merge branch 'MH-616' into dev