Merge pull request #20 from allisonlarson/master

Last minute finishes
Added a Dockerfile for our Rails app
Merge branch 'master' of github.com:tyrbo/tunefish