Updated for Spring

Updated the code for Spring 2014.  Added a bit of code in case I want
to do better and make it initialize from a manifest file.