Update FAQ to ensure proper bundle --path
Merge pull request #680 from seanknox/master

Fix typo in FAQ
Adds adium.
Merge remote-tracking branch 'upstream/master'
Removes flux.