synced with the latest projectile version
added $HOME/bin to the path env variable under osx
added a mention of the Emacs Prelude google group in the README
Adding missing newline in installer.sh usage text

Usage was missing a newline between --colors and --directory.
Merge pull request #211 from leoger/patch-1

Adding missing newline in installer.sh usage text
fixed a couple of keybinding inconsistencies
added a very helpful command prelude-swap-meta-and-super bound to C-c w
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
turns out using a mode in a hook always enables it so the turn on
functions were not actually needed
updated the section about disabling whitespace-mode
Fix obsolete warnings (as of yasnippet 0.8):

- use `yas-snippet-dirs` instead of obsolete `yas/snippet-dirs`
- use `yas-global-mode` instead of obsolete `yas/global-mode`
Merge pull request #218 from bronislav/fixes

Fix obsolete warnings (as of yasnippet 0.8):
fixed #220 - load volatile-highlights after advising kill-line and kill-region
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
bundle solarized by default
added the exec-path-from-shell package
replaced a bunch of concats with expand-file-name
added support for the Scala programming language
fixed helm-mini fallback
Merge pull request #223 from kautsig/master

fixed helm-mini fallback if no projectile is available