@@ -26,11 +26,11 @@ (let ((full-path (concat path file)))
               (if (and (not (string-prefix-p "." file))
                        (file-directory-p full-path))
                   (add-to-list 'load-path full-path))))
-          (directory-files *el-get-dir*))))
+          (directory-files path))))
 
 (if (file-exists-p (concat *el-get-dir* "el-get"))
-	(add-to-list 'load-path *el-get-dir*)
-    (add-subdirs-to-load-path *el-get-dir*)
+    (progn (add-subdirs-to-load-path *el-get-dir*)
+	   (add-to-list 'load-path *el-get-dir*))
   (unless (require 'el-get nil t)
     (with-current-buffer
       (url-retrieve-synchronously
@@ -578,7 +578,16 @@ org-export-have-math t
 
                   org-blank-before-new-entry '((heading . t)
                                                (plain-list-item . auto))
-                  org-fontify-done-headline t))
+                  org-fontify-done-headline t)
+
+            (defadvice org-clock-in (after wicked activate)
+              "Mark STARTED when clocked in"
+              (save-excursion
+                (catch 'exit
+                  (org-back-to-heading t)
+                  (if (looking-at org-outline-regexp) (goto-char (1- (match-end 0))))
+                  (if (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)"))
+                      (org-todo "STARTED"))))))
   :init (setq org-replace-disputed-keys t
               org-todo-keywords '((sequence "TODO" "STARTED" "|" "DONE")
                                   (sequence "TOLEARN" "LEARNING" "LEARNED" "|" "MASTERED")