Added: betarat aliases, fill_screen R repl helper, cloc definitions (not working yet...)
Fixed merge conflict (both compatible additions)