Migrate to spring

Squashed commit of the following:

commit ecff3da59b3421f1ac8fa1e5009becb7458aaf27
Author: Ian Shafer <ian@yabbly.com>
Date:   Mon Jul 14 07:23:06 2014 -0700

    wip

commit b3dbc90e36de62883970a7a85721439558ba6b95
Author: Ian Shafer <ian@yabbly.com>
Date:   Mon Jul 14 07:15:29 2014 -0700

    wip

commit 890fa338698dd8fbefbec372393bb54b8ea955e5
Author: Ian Shafer <ian@yabbly.com>
Date:   Sun Jul 13 14:50:29 2014 -0700

    wip

commit d9ed274796018758508c9ffbdebeed80138b4d87
Author: Ian Shafer <ian@yabbly.com>
Date:   Sun Jul 13 14:28:39 2014 -0700

    wip

commit 2a4930deeebf88c48cbaf2ed2ec1461a05982101
Author: Ian Shafer <ian@yabbly.com>
Date:   Sat Jul 12 16:10:31 2014 -0700

    wip
Version update on release