removed the unstable git branching code for the master merge
removed fixed todo
Merge pull request #49 from jovanbulck/rl_completion_and_version_in_makefile

Rl completion and version in makefile
merged with master