Some configuration updates
Use the $HOME env variable
Some updates, sourctree now mergetool
Added Livestreamer default arguments