updated .gitignore, upgraded to rails 4.  This closes issue #37, and closes issue #21