   ;; don't give awarning colour to tasks with impending deadlines
   ;; if they are scheduled to be done
   (setq org-agenda-skip-deadline-prewarning-if-scheduled (quote pre-scheduled))
-
-  ;; don't show tasks that are scheduled or have deadlines in the normal todo list
-  (setq org-agenda-todo-ignore-deadlines (quote all))
-  (setq org-agenda-todo-ignore-scheduled (quote all))
 
   ;; sort tasks in order of when they are due and then by priority
   (setq org-agenda-sorting-strategy


  :bind
  (("C-c l" . org-store-link)
   ("C-c a" . org-agenda)))

;; fill-column-indicator
;; Graphically indicate the fill column

  (setq org-agenda-window-setup (quote current-window))

  ;; bind capture templates
  (setq org-capture-templates
	'(("t" "todo" entry (file+headline "~/cloud/org/todo.org" "Tasks")
	   "* TODO [#A] %? \n  %u")
	  ("s" "scheduled todo" entry (file+headline "~/cloud/org/todo.org" "Tasks")
	   "* TODO [#A] %? \n  SCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n  %u\n")
	  ("m" "scheduled mail" entry (file+headline "~/cloud/org/todo.org" "Tasks")
	   "* TODO [#A] %? \n  SCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n  %u\n  %a\n")
	  ("n" "Note" entry (file+headline "~/cloud/org/notes.org" "Notes")
	   "* %? \n  %i\n  %u\n  %a\n")
	  ("p" "Project Idea" entry (file+headline "~/cloud/org/projects.org" "INBOX")
	   "* %? \n  %i\n  %u\n  %a\n")
	  ("w" "Wiki Entry" entry (file+headline "~/cloud/org/wiki.org" "INBOX")
	   "* %? \n  %u\n  %i\n")))

  ;; warn of deadlines in the next seven days
  (setq org-deadline-warning-days 7)
