Doesn't error out if already unlocked
Merge branch 'master' of https://github.com/iron-io/glock
Got rid of \r's
Got rid of \r's