Merge remote-tracking branch 'origin/master' into purdue-cs/master

# Conflicts:
#	.config/X11/clientrc
#	.config/emacs/init.el

7 files changed, 328 insertions, 215 deletions

diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index 46c4edd..ff44f2e 100644
--- a/.config/X11/clientrc
+++ b/.config/X11/clientrc
@@ -19,7 +19,7 @@ fi
 
 exec mate-session
 
-if [[ -z "$XDG_RUNTIME_DIR" ]]; then
+if [ -z "$XDG_RUNTIME_DIR" ]; then
 	printf "XDG_RUNTIME_DIR isn't set\n" >&2
 	exit 6
 fi
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 82aebfb..4cf58d4 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -3,7 +3,9 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(custom-enabled-themes (quote (tango-dark)))
+ '(ansi-color-names-vector
+   ["#212526" "#ff4b4b" "#b4fa70" "#fce94f" "#729fcf" "#e090d7" "#8cc4ff" "#eeeeec"])
+ '(custom-enabled-themes (quote (tsdh-dark)))
  '(custom-safe-themes
    (quote
     ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 39dcf0e..e0e39d4 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -105,6 +105,8 @@
                        (set (make-local-variable 'tab-width) 2)
                        (set (make-local-variable 'indent-tabs-mode) nil)
                        )))
+  (:name glsl-mode :type elpa)
+  (:name go-mode :type elpa)
   (:name graphviz-dot-mode :type elpa)
   (:name haml-mode :type elpa)
   (:name markdown-mode :type elpa
@@ -112,7 +114,6 @@
   (:name nginx-mode :type elpa
    :after (put 'nginx-indent-level 'safe-local-variable 'integerp))
   (:name scss-mode :type elpa)
-  (:name go-mode :type elpa)
   (:name yaml-mode :type elpa)
   ))
 ;; What packages el-get should install, both from above, and it's
@@ -132,13 +133,14 @@
     ;;nxhtml ; nxhtml is invasive, only enable if actively using
     bison-mode
     coffee-mode
+    glsl-mode
+    go-mode
     graphviz-dot-mode
     haml-mode
     markdown-mode
     nginx-mode
     php-mode-improved
     scss-mode
-    go-mode
     yaml-mode
     )))
 
@@ -328,3 +330,4 @@ sh-script.el is broken."
 (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
 (add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode))
 (add-to-list 'auto-mode-alist '("\\.jad\\'" . java-mode))
+(put 'downcase-region 'disabled nil)
diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc
index 792b42c..397ffcf 100644
--- a/.config/maildirproc/att.rc
+++ b/.config/maildirproc/att.rc
@@ -23,6 +23,19 @@ def mailman_domain(mail, domain):
 				return m.group(1)
 	return None
 
+def ezmlm_domain(mail, domain):
+	"""
+	Return a string that is the list-name for a ezmlm domain
+	"""
+	m = mail["Mailing-List"].matches("^(.* )?(\w+)(-\S*)?@"+re.escape(domain)+"(;.*)?$")
+	if m:
+		return m.group(2)
+	for hdr in [ 'To', 'Cc', 'From' ]:
+		m = mail[hdr].matches("(\w)@"+re.escape(domain))
+		if m:
+			return m.group(1)
+	return None
+
 def is_to_or_from(mail,address):
 	"""
 	Return true if [mail] is to or from an address that contains [address].
@@ -86,25 +99,38 @@ def handle_incoming_unknown(mail):
 	# Whitelist
 	if (
 		False
+		or is_to_or_from(mail, "Bryan@ChankTunUnGi.onmicrosoft.com")
+		or is_to_or_from(mail, "cacnedcomms@gmail.com")
 		or is_to_or_from(mail, "fsf.org")
 		or is_to_or_from(mail, "gnu.org")
 		or is_to_or_from(mail, "parabola.nu")
 		or is_to_or_from(mail, "parabolagnulinux.org")
-		or mail["From"] == "MAILER-DAEMON@yahoo.com"
 		or mail["From"] == "3174451635@mms.att.net"
+		or mail["From"] == "MAILER-DAEMON@yahoo.com"
+		or mail["From"].contains("@e.oldnational.com>")
 		or mail["From"].contains("@facebookmail.com>")
 		or mail["From"].contains("@gandi.net")
 		or mail["From"].contains("@github.com>")
 		or mail["From"].contains("@goodwillindy.org>")
 		or mail["From"].contains("@kickstarter.com>")
+		or mail["From"].contains("@list.cr.yp.to")
 		or mail["From"].contains("@lpi.org>")
+		or mail["From"].contains("@lulzbot.com>")
+		or mail["From"].contains("@mail.scribd.com>")
+		or mail["From"].contains("@massdrop.com>")
 		or mail["From"].contains("@msdlt.k12.in.us>")
 		or mail["From"].contains("@parabola.nu")
 		or mail["From"].contains("@post.oreilly.com>")
 		or mail["From"].contains("@scouting.org>")
+		or mail["From"].contains("@solutionsinplastic.com>")
+		or mail["From"].contains("@startcom.org>")	
+		or mail["From"].contains("@usfirst.org>")
 		or mail["From"].contains("@wolframalpha.com>")
+		or mail["From"].contains("Promo@email.newegg.com")
+		or mail["From"].contains("info@email2.mysimplemobile.com")
 		or mail["From"].contains("margieshu@sbcglobal.net")
 		or mail["From"].contains("parabolagnulinux.org")
+		or mail["From"].matches("@[a-z]+\.gandi\.net")
 		or mail["List-Id"].matches(".*\.(gnu|gnome|archlinux|parabolagnulinuxlibre|fedorahosted)\.org")
 		or mail["List-Id"].matches(".*\.parabola\.nu")
 		or mail["Subject"].contains("[Dev]")
@@ -144,7 +170,12 @@ def my_filters(mail):
 	              [ 'parabola.nu', 'parabola' ] ]:
 		list = mailman_domain(mail, pair[0])
 		if list:
-			move_ham(mail,".software."+pair[1]+"."+list)
+			move_ham(mail, ".software."+pair[1]+"."+list)
+			return
+	for pair in [ [ 'list.cr.yp.to', 'djb' ] ]:
+		list = ezmlm_domain(mail, pair[0])
+		if list:
+			move_ham(mail, ".software."+pair[1]+"."+list)
 			return
 	if (
 		False
@@ -152,12 +183,12 @@ def my_filters(mail):
 		or is_to_or_from(mail, "parabola.nu")
 		or is_to_or_from(mail, "kiwwwi.com.ar")
 		):
-		move_ham(mail,".software.parabola")
+		move_ham(mail, ".software.parabola")
 		return
 	
 	# Sort mail from some social websites
 	if mail["From"].matches("facebook(|mail)\.com"):
-		move_ham(mail,".Social.Facebook")
+		move_ham(mail, ".Social.Facebook")
 		return
 	
 	if (
@@ -165,7 +196,7 @@ def my_filters(mail):
 		or mail["From"].matches("identi\.ca")
 		or mail["From"].matches("statusnet")
 		):
-		move_ham(mail,".Social.Identica")
+		move_ham(mail, ".Social.Identica")
 		return
 	
 	if (
@@ -173,49 +204,54 @@ def my_filters(mail):
 		or mail["From"].contains("@gandi.net")
 		or mail["From"].contains("@ramhost.us")
 		or mail["From"].contains("@startcom.org")
+		or (mail["From"].contains("@2co.com") and mail["Subject"].contains("RAM Host"))
 		):
-		move_ham(mail,".lukeshu-com")
+		move_ham(mail, ".lukeshu-com")
 		return
 
 	if mail["From"].matches("twitter\.com"):
-		move_ham(mail,".Social.Twitter")
+		move_ham(mail, ".Social.Twitter")
 		return
 	
 	if mail["From"].matches("@xkcd\.com"):
-		move_ham(mail,".Social.xkcd")
+		move_ham(mail, ".Social.xkcd")
 		return
 	
 	# Sort mail related to Troop 276
 	if (
 		False
 		or mail["List-Id"].contains("troopmailinglist.troop276.net")
-		or is_to_or_from(mail,"t276_announcements@att.net")
+		or is_to_or_from(mail, "t276_announcements@att.net")
 		or mail["Subject"].matches("troop")
 		or mail["Subject"].matches("merit\s*badge")
-		or is_to_or_from(mail,"jsting@sbcglobal.net")
-		or is_to_or_from(mail,"trdindy@comcast.net")
-		or is_to_or_from(mail,"wjensen111@aol.com")
-		or is_to_or_from(mail,"dhoyt@yourhomecompany.com")
-		or is_to_or_from(mail,"salupo_vincent_p@lilly.com")
-		or is_to_or_from(mail,"basu@maharjan.org")
-		or is_to_or_from(mail,"muellerindy@yahoo.com")
-		or is_to_or_from(mail,"solorzano.luis@rocketmail.com")
-		or is_to_or_from(mail,"eldredmac@comcast.net")# MacDonell
-		or is_to_or_from(mail,"mitchprather@sbcglobal.net")
-		or is_to_or_from(mail,"oa_wap@yahoo.com")
-		or is_to_or_from(mail,"mytroop.us")
-		or is_to_or_from(mail,"crossroadsbsa.org")
+		or is_to_or_from(mail, "Bryan@ChankTunUnGi.onmicrosoft.com")
+		or is_to_or_from(mail, "basu@maharjan.org")
+		or is_to_or_from(mail, "cacnedcomms@gmail.com")
+		or is_to_or_from(mail, "crossroadsbsa.org")
+		or is_to_or_from(mail, "dhoyt@yourhomecompany.com")
+		or is_to_or_from(mail, "dllargent@comcast.net")
+		or is_to_or_from(mail, "eldredmac@comcast.net")# MacDonell
+		or is_to_or_from(mail, "jsting@sbcglobal.net")
+		or is_to_or_from(mail, "mitchprather@sbcglobal.net")
+		or is_to_or_from(mail, "muellerindy@yahoo.com")
+		or is_to_or_from(mail, "mytroop.us")
+		or is_to_or_from(mail, "oa_wap@yahoo.com")
+		or is_to_or_from(mail, "salupo_vincent_p@lilly.com")
+		or is_to_or_from(mail, "scouting.org")
+		or is_to_or_from(mail, "solorzano.luis@rocketmail.com")
+		or is_to_or_from(mail, "trdindy@comcast.net")
+		or is_to_or_from(mail, "wjensen111@aol.com")
 		):
-		move_ham(mail,".BoyScouts")
+		move_ham(mail, ".BoyScouts")
 		return
 
 	# Sort mail from misc people
 	if (
 		False
-		or is_to_or_from(mail,"margieshu@sbcglobal.net")
-		or is_to_or_from(mail,"3174451635@mms.att.net")
+		or is_to_or_from(mail, "margieshu@sbcglobal.net")
+		or is_to_or_from(mail, "3174451635@mms.att.net")
 		):
-		move_ham(mail,".misc.Mom")
+		move_ham(mail, ".misc.Mom")
 		return
 
 	for address in [
@@ -223,23 +259,24 @@ def my_filters(mail):
 		"nintendo-news.com",
 		]:
 		if mail["From"].contains(address):
-			move_ham(mail,".misc.Nintendo")
+			move_ham(mail, ".misc.Nintendo")
 			return
 
 	for address in [
 		"@lpi.org",
 		"@pearson.com",
+		"ciscotraining-notify@cisco.com",
 		"CompTIA",
 		]:
 		if mail["From"].contains(address):
-			move_ham(mail,".misc.CompTIA")
+			move_ham(mail, ".misc.CompTIA")
 			return
 	
 	# Sort mail from FRC people
 	# Generic
 	for address in [ "@ni.com", "@usfirst.org" ]:
 		if is_to_or_from(mail,address):
-			move_ham(mail,".FRC")
+			move_ham(mail, ".FRC")
 			return
 	# FRC 829
 	for address in [
@@ -247,10 +284,10 @@ def my_filters(mail):
 		"william.walk@gmail.com",
 		]:
 		if is_to_or_from(mail,address):
-			move_ham(mail,".FRC.829")
+			move_ham(mail, ".FRC.829")
 			return
 	if mail["Subject"].matches("\b829\b"):
-		move_hame(mail,".FRC.829")
+		move_ham(mail, ".FRC.829")
 		return
 	# FRC 1024
 	for address in [
@@ -270,15 +307,15 @@ def my_filters(mail):
 		"tswilson4801@att.net",
 		]:
 		if is_to_or_from(mail,address):
-			move_ham(mail,".FRC.1024")
+			move_ham(mail, ".FRC.1024")
 			return
 	for subject_re in [ "\b1024\b", "kil-?a-?bytes" ]:
 		if mail["Subject"].matches(subject_re):
-			move_ham(mail,".FRC.1024")
+			move_ham(mail, ".FRC.1024")
 			return
 	# FRC 4272
 	if mail["Subject"].matches("\b4272\b"):
-		move_hame(mail,".FRC.4272")
+		move_ham(mail, ".FRC.4272")
 		return
 
 	# Catch BS things because of CS classes before the general
@@ -310,7 +347,7 @@ def my_filters(mail):
 		"@thyrsus.com",
 		]:
 		if is_to_or_from(mail,address):
-			move_ham(mail,".software")
+			move_ham(mail, ".software")
 			return
 
 	# Sort mail from the school newspaper
@@ -319,21 +356,38 @@ def my_filters(mail):
 		or is_to_or_from(mail, "@lnnorthstar.org")
 		or is_to_or_from(mail, "lnnorthstar.org@tigertech.net")
 		):
-		move_ham(mail,".HighSchool.Newspaper")
+		move_ham(mail, ".HighSchool.Newspaper")
 		return
 
 	# Sort misc newsletters
 	if (
 		False
 		or mail["From"].contains("newsletter")
-		or mail["From"].contains("auto@comicsbyemail.com")
-		or mail["From"].contains("oreilly.com")
+		or mail["From"].contains("announcements")
 		or mail["Subject"].contains("newsletter")
+		or mail["Message-Id"].contains("@sailthru.com")
+		or False
+		or (mail["From"].contains("@sparkfun.com") and mail["Message-Id"].contains("rsgsv.net"))
+		or (mail["From"].contains("no-reply@kickstarter.com") and mail["Message-Id"].contains(".sendgrid.net"))
+		or (mail["From"].contains("no-reply@kickstarter.com") and (
+			False
+			or mail["Subject"].contains("Projects We Love:")
+			or mail["Subject"].contains("Project Update")))
 		or mail["From"].contains("Info@mailing.jamendo.com")
+		or mail["From"].contains("Promo@email.newegg.com")
+		or mail["From"].contains("auto@comicsbyemail.com")
 		or mail["From"].contains("info@demandprogress.org")
-		or (mail["From"].contains("@sparkfun.com") and mail["Message-Id"].contains("rsgsv.net"))
+		or mail["From"].contains("info@email2.mysimplemobile.com")
+		or mail["From"].contains("info@massdrop.com")
+		or mail["From"].contains("info@lulzbot.com")
+		or mail["From"].contains("oreilly.com")
+		or mail["From"].contains("reply-to@e.digikey.com")
+		or mail["From"].contains("communication@communications.bmv.in.gov")
+		or mail["From"].contains("sales@solutionsinplastic.com")
+		or mail["From"].contains("social@goodwillindy.org")
+		or mail["From"].contains("support@support.digitalocean.com")
 		):
-		move_ham(mail,".misc.Newsletters")
+		move_ham(mail, ".misc.Newsletters")
 		return
 
 	if (
@@ -341,7 +395,7 @@ def my_filters(mail):
 		or mail["From"].contains("@msdlt.k12.in.us")
 		or mail["From"].contains("ltschoolfoundation@gmail.com")
 		or mail["From"].contains("naviance.com")
-		or is_to_or_from(mail,"ibwhite@comcast.net")
+		or is_to_or_from(mail, "ibwhite@comcast.net")
 		or mail["Subject"].contains("IOA")
 		or mail["From"].contains("nths.org")
 		or mail["Subject"].contains("NTHS")
@@ -349,7 +403,7 @@ def my_filters(mail):
 		or mail["Subject"].contains("NHS")
 		or mail["Subject"].contains("National Honor Society")
 		):
-		move_ham(mail,".HighSchool")
+		move_ham(mail, ".HighSchool")
 		return
 	
 	# from college stuff
@@ -358,7 +412,7 @@ def my_filters(mail):
 		or mail["Subject"].contains("NYLF") # National Youth Leadership Conference
 		or mail["Subject"].contains("NSHSS")
 		):
-		move_ham(mail,".College.Societies")
+		move_ham(mail, ".College.Societies")
 		return	
 	if (
 		False
@@ -368,11 +422,11 @@ def my_filters(mail):
 		or mail["From"].contains("@dreamitdoitindiana.com")
 		or mail["From"].contains("@indianatechinfo.org")
 		):
-		move_ham(mail,".College")
+		move_ham(mail, ".College")
 		return
 	
 	if mail["From"].contains("@projectwonderful.com"):
-		move_ham(mail,".misc.ProjectWonderful")
+		move_ham(mail, ".misc.ProjectWonderful")
 		return
 
 	if (
@@ -382,17 +436,18 @@ def my_filters(mail):
 		or mail["From"].matches("@[^,>]*\.lan")
 		or mail["To"].matches("luke@")
 		):
-		move_ham(mail,".LocalSystems")
+		move_ham(mail, ".LocalSystems")
 		return
 	if (
 		False
 		or mail["Subject"].contains("password")
 		or mail["Subject"].contains("account")
+		or mail["From"].contains("accounts")
 		):
-		move_ham(mail,".misc.accounts")
+		move_ham(mail, ".misc.accounts")
 		return
 
-	move_ham(mail,"")
+	move_ham(mail, "")
 
 handle_mapping = {
 	"Inbox":                 handle_incoming_unknown,
diff --git a/.config/maildirproc/purdue.rc b/.config/maildirproc/purdue.rc
index f086eee..06f349b 100644
--- a/.config/maildirproc/purdue.rc
+++ b/.config/maildirproc/purdue.rc
@@ -24,8 +24,11 @@ def is_to_or_from_re(mail,address):
 
 def piazza_topic(mail, topic):
 	return (
-		is_to_or_from(mail, topic+" on Piazza")
-		or mail["Subject"].contains(topic+" on Piazza"))
+		False
+		or is_to_or_from(mail, topic+" on Piazza")
+		or mail["Subject"].contains(topic+" on Piazza")
+		or (is_to_or_from(mail, "@piazza.com>") and mail["Subject"].contains(" in "+topic+": "))
+	)
 
 def my_filters(mail):
 	# Generic stuff ########################################################
@@ -79,6 +82,7 @@ def my_filters(mail):
 		or is_to_or_from(mail, "@alerts.comcast.net")
 		or is_to_or_from(mail, "rentpayment.com")
 		or is_to_or_from(mail, "@vectren.com")
+		or is_to_or_from(mail, "@vectrenemail.com")
 		):
 		mail.move("INBOX.housing.BeauJardin")
 		return
@@ -91,7 +95,11 @@ def my_filters(mail):
 		mail.move("INBOX.crap.CERIAS")
 		return
 
-	if is_to_or_from(mail,"royfu@purdue.edu"):
+	if (
+		False
+		or is_to_or_from(mail,"royfu@purdue.edu")
+		or is_to_or_from(mail,"usmannkhan@purdue.edu")
+		):
 		mail.move("INBOX.crap.Hackers")
 		return
 
@@ -123,173 +131,219 @@ def my_filters(mail):
 		mail.move("INBOX.crap.cron")
 		return
 
-	# Fall 2012 ############################################################
-
-	# SCI210 (Teaming principles)
-	if mail["Subject"].contains("Fall-2012-SCI-21000-001:"):
-		mail.move("INBOX.classes.2012-2.SCI210")
-	# CS180 (Java)
-	if mail["Subject"].contains("fall-2012-cs-18000"):
-		mail.move("INBOX.classes.2012-2.CS180")
-		return
-	if piazza_topic(mail, "CS 18000"):
-		mail.move("INBOX.classes.2012-2.CS180.Piazza")
-		return
-	# SOC100
-	if mail["Subject"].contains("Fall-2012-SOC-10000"):
-		mail.move("INBOX.classes.2012-2.SOC100")
-		return
-
-	# Spring 2013 ##########################################################
-
-	# CS240 (C)
-	if mail["Subject"].contains("[CS240] Submission result for"):
-		mail.move("INBOX.classes.2013-1.CS240.autograder")
-		return
-	if mail["Subject"].contains("[CS240]") or mail["Subject"].contains("Spring-2013-CS-24000"):
-		mail.move("INBOX.classes.2013-1.CS240")
-		return
-	if piazza_topic(mail, "CS 240"):
-		mail.move("INBOX.classes.2013-1.CS240.Piazza")
-		return
-	# PHYS220
-	if mail["Subject"].matches(".*(PHYS|CHIP)\s*220.*") or is_to_or_from(mail,"srdas@purdue.edu"):
-		mail.move("INBOX.classes.2013-1.PHYS220")
-		return
-	# SOC220 (Social Problems)
-	if mail["Subject"].contains("Spring-2013-SOC-22000"):
-		mail.move("INBOX.classes.2013-1.SOC220")
-		return
-
-	# Fall 2013 ############################################################
-
-	# CS250 (Computer Architecture)
-	if mail["Subject"].contains("Fall-2013-CS-25000"):
-		mail.move("INBOX.classes.2013-2.CS250")
-		return
-	if piazza_topic(mail, "CS 250") or piazza_topic(mail, "CS 250-FALL2013"):
-		mail.move("INBOX.classes.2013-2.CS250.Piazza")
-		return
-	# CS251 (Intro Algo)
-	if mail["Subject"].contains("Fall-2013-CS-25100"):
-		mail.move("INBOX.classes.2013-2.CS251")
-		return
-	if piazza_topic(mail, "CS 251"):
-		mail.move("INBOX.classes.2013-2.CS251.Piazza")
-		return
-	# SPAN101
-	if mail["Subject"].contains("Fall-2013-SPAN-10100"):
-		mail.move("INBOX.classes.2013-2.SPAN101")
-		return
-	# MA261 (Calc III)
-	if mail["Subject"].contains("Fall-2013-MA-26100"):
-		mail.move("INBOX.classes.2013-2.MA261")
-		return
-	# MA265 (Linear Algebra)
-	if mail["Subject"].contains("Fall-2013-MA-26500"):
-		mail.move("INBOX.classes.2013-2.MA265")
-		return
-
-	# Spring 2014 ##########################################################
-
-	# COM217
-	if mail["Subject"].contains("Spring-2014-COM-21700-004"):
-		mail.move("INBOX.classes.2014-1.COM217")
-		return
-	if mail["From"].contains("mixable") and mail["Subject"].matches("^COM 21700"):
-		mail.move("INBOX.classes.2014-1.COM217.Mixable")
+	if is_to_or_from(mail,"austin-group-l@opengroup.org"):
+		mail.move("INBOX.POSIX")
+		return
+
+	if mail["From"].contains("build@travis-ci.org"):
+		mail.move("INBOX.crap.TravisCI")
+		return
+
+	# # Fall 2012 ############################################################
+
+	# # SCI210 (Teaming principles)
+	# if mail["Subject"].contains("Fall-2012-SCI-21000-001:"):
+	# 	mail.move("INBOX.classes.2012-2.SCI210")
+	# # CS180 (Java)
+	# if mail["Subject"].contains("fall-2012-cs-18000"):
+	# 	mail.move("INBOX.classes.2012-2.CS180")
+	# 	return
+	# if piazza_topic(mail, "CS 18000"):
+	# 	mail.move("INBOX.classes.2012-2.CS180.Piazza")
+	# 	return
+	# # SOC100
+	# if mail["Subject"].contains("Fall-2012-SOC-10000"):
+	# 	mail.move("INBOX.classes.2012-2.SOC100")
+	# 	return
+
+	# # Spring 2013 ##########################################################
+
+	# # CS240 (C)
+	# if mail["Subject"].contains("[CS240] Submission result for"):
+	# 	mail.move("INBOX.classes.2013-1.CS240.autograder")
+	# 	return
+	# if mail["Subject"].contains("[CS240]") or mail["Subject"].contains("Spring-2013-CS-24000"):
+	# 	mail.move("INBOX.classes.2013-1.CS240")
+	# 	return
+	# if piazza_topic(mail, "CS 240"):
+	# 	mail.move("INBOX.classes.2013-1.CS240.Piazza")
+	# 	return
+	# # PHYS220
+	# if mail["Subject"].matches(".*(PHYS|CHIP)\s*220.*") or is_to_or_from(mail,"srdas@purdue.edu"):
+	# 	mail.move("INBOX.classes.2013-1.PHYS220")
+	# 	return
+	# # SOC220 (Social Problems)
+	# if mail["Subject"].contains("Spring-2013-SOC-22000"):
+	# 	mail.move("INBOX.classes.2013-1.SOC220")
+	# 	return
+
+	# # Fall 2013 ############################################################
+
+	# # CS250 (Computer Architecture)
+	# if mail["Subject"].contains("Fall-2013-CS-25000"):
+	# 	mail.move("INBOX.classes.2013-2.CS250")
+	# 	return
+	# if piazza_topic(mail, "CS 250") or piazza_topic(mail, "CS 250-FALL2013"):
+	# 	mail.move("INBOX.classes.2013-2.CS250.Piazza")
+	# 	return
+	# # CS251 (Intro Algo)
+	# if mail["Subject"].contains("Fall-2013-CS-25100"):
+	# 	mail.move("INBOX.classes.2013-2.CS251")
+	# 	return
+	# if piazza_topic(mail, "CS 251"):
+	# 	mail.move("INBOX.classes.2013-2.CS251.Piazza")
+	# 	return
+	# # SPAN101
+	# if mail["Subject"].contains("Fall-2013-SPAN-10100"):
+	# 	mail.move("INBOX.classes.2013-2.SPAN101")
+	# 	return
+	# # MA261 (Calc III)
+	# if mail["Subject"].contains("Fall-2013-MA-26100"):
+	# 	mail.move("INBOX.classes.2013-2.MA261")
+	# 	return
+	# # MA265 (Linear Algebra)
+	# if mail["Subject"].contains("Fall-2013-MA-26500"):
+	# 	mail.move("INBOX.classes.2013-2.MA265")
+	# 	return
+
+	# # Spring 2014 ##########################################################
+
+	# # COM217
+	# if mail["Subject"].contains("Spring-2014-COM-21700-004"):
+	# 	mail.move("INBOX.classes.2014-1.COM217")
+	# 	return
+	# if mail["From"].contains("mixable") and mail["Subject"].matches("^COM 21700"):
+	# 	mail.move("INBOX.classes.2014-1.COM217.Mixable")
+	# 	return
+	# # CS252 (Systems Programming)
+	# if piazza_topic(mail, "CS 25200"):
+	# 	mail.move("INBOX.classes.2014-1.CS252.Piazza")
+	# 	return
+	# # CS307 (Software Engineering)
+	# if is_to_or_from(mail, "dunsmore@purdue.edu") or mail["Subject"].contains("Spring-2014-CS-30700-LE1"):
+	# 	mail.move("INBOX.classes.2014-1.CS307")
+	# 	return
+	# # SPAN102
+	# if mail["Subject"].contains("spring-2014-span-102"):
+	# 	mail.move("INBOX.classes.2014-1.SPAN102")
+	# 	return
+	# # STAT350
+	# if is_to_or_from(mail, "ssellke@purdue.edu"):
+	# 	mail.move("INBOX.classes.2014-1.STAT350")
+	# 	return
+	# if piazza_topic(mail, "STAT 35000 (SELLKE)"):
+	# 	mail.move("INBOX.classes.2014-1.STAT350.Piazza")
+	# 	return
+
+	# # Fall 2014 ############################################################
+
+	# # CS334 (Graphics)
+	# if (is_to_or_from(mail, "lin553@purdue.edu") or mail["Subject"].contains("Fall-2014-CS-33400")):
+	# 	mail.move("INBOX.classes.2014-2.CS334")
+	# 	return
+	# # CS354 (OS)
+	# if piazza_topic(mail, "CS 354"):
+	# 	mail.move("INBOX.classes.2014-2.CS354.Piazza")
+	# 	return
+	# # CS381 (Algo)
+	# if piazza_topic(mail, "CS 381"):
+	# 	mail.move("INBOX.classes.2014-2.CS381.Piazza")
+	# 	return
+	# # CS456 (Programming languages)
+	# if piazza_topic(mail, "CS 456"):
+	# 	mail.move("INBOX.classes.2014-2.CS456.Piazza")
+	# 	return
+	# # MA416
+	# if mail["Subject"].contains("Fall-2014-MA-41600"):
+	# 	mail.move("INBOX.classes.2014-2.MA416")
+	# 	return
+	# # PHYS221
+	# if (False
+	# 	or is_to_or_from(mail, "cui@purdue.edu")
+	# 	or is_to_or_from(mail, "shina@purdue.edu")
+	# 	or is_to_or_from(mail, "ajith@purdue.edu")
+	# 	):
+	# 	mail.move("INBOX.classes.2014-2.PHYS221")
+	# 	return
+
+	# # Spring 2015 #########################################################
+
+	# # CS352 (Compilers)
+	# if is_to_or_from(mail, "wjg@cs.purdue.edu"):
+	# 	mail.move("INBOX.classes.2015-1.CS352")
+	# 	return
+	# if piazza_topic(mail, "CS 352"):
+	# 	mail.move("INBOX.classes.2015-1.CS352.Piazza")
+	# 	return
+	# # CS408 (Software testing)
+	# if (False
+	# 	or mail["Subject"].contains("spring-2015-cs-40800")
+	# 	or is_to_or_from(mail, "li1471@purdue.edu")
+	# 	or is_to_or_from(mail, "kirby@purdue.edu")
+	# 	or is_to_or_from(mail, "webb39@purdue.edu")
+	# 	or is_to_or_from(mail, "Jkou@purdue.edu")
+	# 	or is_to_or_from(mail, "nstodda@purdue.edu")
+	# 	or is_to_or_from(mail, "aryker@purdue.edu") # TA
+	# 	):
+	# 	mail.move("INBOX.classes.2015-1.CS408")
+	# 	return
+	# # CS448 (Databases)
+	# if piazza_topic(mail, "CS 44800"):
+	# 	mail.move("INBOX.classes.2015-1.CS448.Piazza")
+	# 	return
+	# if mail["Subject"].matches("CS *448"):
+	# 	mail.move("INBOX.classes.2015-1.CS448")
+	# 	return
+	# # ME297 (FRC)
+	# if (False
+	# 	or mail["Subject"].contains("[ME297]")
+	# 	or is_to_or_from(mail, "heller5@purdue.edu")
+	# 	):
+	# 	mail.move("INBOX.classes.2015-1.ME297")
+	# 	return
+	# # SOC324 (Criminology)
+	# if mail["Subject"].contains("spring-2015-soc-32400"):
+	# 	mail.move("INBOX.classes.2015-1.SOC324")
+	# 	return
+
+	# Spring 2015 ###############################z##########################
+
+	# CHM 490 (History & Philosophy of Science)
+	if is_to_or_from(mail, "gmbodner@purdue.edu"):
+		mail.move("INBOX.classes.2015-2.CHM490")
+		return
+	# CS 334 (Graphics)
+	if (
+		False
+		or mail["Subject"].contains("fall-2015-cs-33400-le1")
+		or is_to_or_from(mail, "aliaga@purdue.edu")
+		or is_to_or_from(mail, "abejara@purdue.edu")
+		):
+		mail.move("INBOX.classes.2015-2.CS334")
 		return
-	# CS252 (Systems Programming)
-	if piazza_topic(mail, "CS 25200"):
-		mail.move("INBOX.classes.2014-1.CS252.Piazza")
+	if piazza_topic(mail, "CS 334"):
+		mail.move("INBOX.classes.2015-2.CS334.Piazza")
 		return
-	# CS307 (Software Engineering)
-	if is_to_or_from(mail, "dunsmore@purdue.edu") or mail["Subject"].contains("Spring-2014-CS-30700-LE1"):
-		mail.move("INBOX.classes.2014-1.CS307")
+	# CS 490 (Senior Project)
+	if is_to_or_from(mail, "anesen@purdue.edu"):
+		mail.move("INBOX.classes.2015-2.CS490")
 		return
-	# SPAN102
-	if mail["Subject"].contains("spring-2014-span-102"):
-		mail.move("INBOX.classes.2014-1.SPAN102")
+	if piazza_topic(mail, "CS 49000"):
+		mail.move("INBOX.classes.2015-2.CS490.Piazza")
 		return
-	# STAT350
-	if is_to_or_from(mail, "ssellke@purdue.edu"):
-		mail.move("INBOX.classes.2014-1.STAT350")
+	# MA 416 (Probability)
+	if mail["Subject"].contains("fall-2015-ma-41600"):
+		mail.move("INBOX.classes.2015-2.MA416")
 		return
-	if piazza_topic(mail, "STAT 35000 (SELLKE)"):
-		mail.move("INBOX.classes.2014-1.STAT350.Piazza")
+	if piazza_topic(mail, "SELLKE 416 "):
+		mail.move("INBOX.classes.2015-2.MA416.Piazza")
 		return
 
-	# Fall 2014 ############################################################
-
-	# CS334 (Graphics)
-	if (is_to_or_from(mail, "lin553@purdue.edu") or mail["Subject"].contains("Fall-2014-CS-33400")):
-		mail.move("INBOX.classes.2014-2.CS334")
-		return
-	# CS354 (OS)
-	if piazza_topic(mail, "CS 354"):
-		mail.move("INBOX.classes.2014-2.CS354.Piazza")
-		return
-	# CS381 (Algo)
-	if piazza_topic(mail, "CS 381"):
-		mail.move("INBOX.classes.2014-2.CS381.Piazza")
+	# FRC 4272
+	if mail["Subject"].contains("[ME297]"):
+		mail.move("INBOX.classes.2015-2.FRC4272")
 		return
-	# CS456 (Programming languages)
-	if piazza_topic(mail, "CS 456"):
-		mail.move("INBOX.classes.2014-2.CS456.Piazza")
-		return
-	# MA416
-	if mail["Subject"].contains("Fall-2014-MA-41600"):
-		mail.move("INBOX.classes.2014-2.MA416")
-		return
-	# PHYS221
-	if (False
-		or is_to_or_from(mail, "cui@purdue.edu")
-		or is_to_or_from(mail, "shina@purdue.edu")
-		or is_to_or_from(mail, "ajith@purdue.edu")
-		):
-		mail.move("INBOX.classes.2014-2.PHYS221")
-		return
-
-	# Spring 2015 #########################################################
 
-	# CS352 (Compilers)
-	if is_to_or_from(mail, "wjg@cs.purdue.edu"):
-		mail.move("INBOX.classes.2015-1.CS352")
-		return
-	if piazza_topic(mail, "CS 352"):
-		mail.move("INBOX.classes.2015-1.CS352.Piazza")
-		return
-	# CS408 (Software testing)
-	if (False
-		or mail["Subject"].contains("spring-2015-cs-40800")
-		or is_to_or_from(mail, "li1471@purdue.edu")
-		or is_to_or_from(mail, "kirby@purdue.edu")
-		or is_to_or_from(mail, "webb39@purdue.edu")
-		or is_to_or_from(mail, "Jkou@purdue.edu")
-		or is_to_or_from(mail, "nstodda@purdue.edu")
-		or is_to_or_from(mail, "aryker@purdue.edu") # TA
-		):
-		mail.move("INBOX.classes.2015-1.CS408")
-		return
-	# CS448 (Databases)
-	if piazza_topic(mail, "CS 44800"):
-		mail.move("INBOX.classes.2015-1.CS448.Piazza")
-		return
-	if mail["Subject"].matches("CS *448"):
-		mail.move("INBOX.classes.2015-1.CS448")
-		return
-	# ME297 (FRC)
-	if (False
-		or mail["Subject"].contains("[ME297]")
-		or is_to_or_from(mail, "heller5@purdue.edu")
-		):
-		mail.move("INBOX.classes.2015-1.ME297")
-		return
-	# SOC324 (Criminology)
-	if mail["Subject"].contains("spring-2015-soc-32400"):
-		mail.move("INBOX.classes.2015-1.SOC324")
-		return
-	
 	# Everything else #####################################################
 	mail.move("INBOX.ham");
 
diff --git a/.config/okular/.gitignore b/.config/okular/.gitignore
deleted file mode 100644
index 4e33b14..0000000
--- a/.config/okular/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-docdata
diff --git a/.config/symlinks b/.config/symlinks
index c99afba..209f291 100644
--- a/.config/symlinks
+++ b/.config/symlinks
@@ -42,7 +42,7 @@
 .config/wmii/		.wmii #
 
 # .maildirproc is not used, but must exist
-/tmp/			.maildirproc
+/var/empty/		.maildirproc
 
 # KDE
 .config/		.kde/share/apps #