Merge pull request #55 from eadz/can_lock_non_scoped_account

fix bug preventing locking a scoped and a non scoped account
update version 0.6.0 -> 0.7.0
Merge pull request #56 from envato/version_bump

update version 0.6.0 -> 0.7.0
specify version of i18n gem
Merge pull request #58 from eadz/specify_version_of_i18n_gem

specify version of i18n gem
Merge pull request #5 from eadz/merge_envato_master

Merge envato master