Update to 4.1, add spring
Merge pull request #1 from barefootford/andrew/upgrade_to_41

Update to 4.1, add spring