added lock alias
Merge branch 'master' of github.com:jamestomasino/dotfiles
added note-taking functions