Add roxterm config; Remove unused aliases and functions from .bashrc; Add git flow alias
Merge branch 'master' into mpv