updated .gitignore, upgraded to rails 4.  This closes #37, and closes #21
Merge branch 'master' of github.com:dhoss/Kodiak