diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..4b53631b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: python
+python:
+  - "2.7"
+  - "3.2"
+install: "pip install cling parsedatetime simplejson --use-mirrors"
+# command to run tests
+script: nosetests
diff --git a/setup.py b/setup.py
index 31818d06..d8f49b14 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ and hit return. yesterday` will be interpreted as a timestamp. Everything until
 
 ::
 
-    2012-03-29 09:00 Called in sick. 
+    2012-03-29 09:00 Called in sick.
     Used the time to clean the house and spent 4h on writing my book.
 
 If you just call jrnl you will be prompted to compose your entry - but you can also configure jrnl to use your external editor.
@@ -81,8 +81,8 @@ setup(
     ],
     # metadata for upload to PyPI
     author = "Manuel Ebert",
-    author_email = "manuel.ebert@upf.edu",
+    author_email = "manuel@herelabs.com",
     license = "MIT License",
     keywords = "journal todo todo.txt jrnl".split(),
-    url = "http://maebert.github.com/jrnl", 
+    url = "http://maebert.github.com/jrnl",
 )