Merge travatar with Neubig's repo