Added number of lines shown in log + alias for mergetool
* No sep directory for github. everything is on it.
* added rspecc formatted alias
* no tabs. bad bad bad