Indentation preferences
Waterfall update

* More robust prompt
* Few new aliases
* Iteration of vim preferences