Reorganized dotfiles; improved syntax highlighting

* Moved .bash_profile contents to .bashrc
* Updated vim highlight rules to apply to git merges in addition to commits
* PATH variable no longer contains duplicate /usr/local/bin entries
* Updated README with clarification and rewording and such