mac/linux compatible zshrc
configure terminator for gnome
resolve merge conflicts
disable vim folding, change colortheme to railscasts