adobe/brackets — pull request #7825 by redmunds (2014-05-12 15:14:33+00:00)
Title: Merge changes from release branch back to master

Mainly want to get ALF changes, but merging all changes so far.