Cleanup + mac os x things

* fix prompt for os x
* Add ~/bin to $PATH
* Remove merb