Add travis file
Add unittest2 to travis file
Fix if statement
Add Python 3.2 to travis file
Merge branch 'travis'