Add 'mrst' bash alias
Add 'mrst' bash alias
Ignore erlang *.beam files
Merge branch 'master' into steele
Make newsbeuter auto reload every hour
Merge branch 'master' into steele
Enable git rerere

Record/replay conflic resolution
Update bashrc
Merge branch 'master' into steele
Skip schedules/deadline items in TODO agenda
Merge branch 'master' into steele