bring up to date and fix merge conflicts
add the verb table
use the github repo for the published test app
remove the rails4 gem
fix merge conflict. Gemfile.lock should be in version control for apps.
remove the rails4_upgrade gem
Merge remote-tracking branch 'upstream/master'
add path for dominicgoulet
ignore Gemfile.lock since we're both testing using different paths.
Merge pull request #5 from acmetech/master

A little clean-up to make things a little easier