Merged jira01-userid-my-feature

Squashed commit of the following:

commit ff8a281a3b7daad771944f01a71ca5105a9f5f78
Author: mruckman <nospam2008@mruckman.com>
Date:   Sun Oct 13 14:11:39 2013 -0700

    Making a quick change

commit cd9a1e1ce4fed1775165d9081613e9bbe582766b
Author: mruckman <nospam2008@mruckman.com>
Date:   Sun Oct 13 14:00:02 2013 -0700

    Adding file 5

commit acd28d0c9a0b07a46426c489892badff907b4fb0
Author: mruckman <nospam2008@mruckman.com>
Date:   Sun Oct 13 13:46:21 2013 -0700