added locking mechanism for editing user information. Before deleting any records, we make sure that only one person is accessing the records.
Fixed broken tests, completed lock feature. The only place which uses it is currently the delete user feature. However, it could be used in many places, but I am not sure where.
Merge branch 'locking' into develop

Completed locking feature, merging to develop so that I can submit a pull request.
Merge remote-tracking branch 'upstream/develop' into develop

Merging what's upstream to submit pull request.
Added requested fixes to locking feature. Specifically, lock is released in finally clause within the deleteUser method of the user admin service. Additionally, we set a check to add expiration in the isLocked method, and changed the lock to be based off the stormpathID, as the stormpath account is the first thing to be created, and the last thing to be deleted, so it is the safest thing to use.
Merge pull request #150 from SartoriusEarth/develop

Added Redis Lock feature.