Cleanup and fixing Travis builds
Updated homepage
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from Darnuss/master

Updated homepage