Cleaned up Luigi's commits
Added travis file