Readded changes reverted by merge
Remove trailing whitespaces
Removed Travis Notifications temporarily so as not to spam thomas, to be added back later