Merge pull request #30 from westonplatter/master

update to rails 4.1.6