joeferraro/MavensMate-Atom — pull request #103 by ralphcallaway (2014-10-21 03:48:41+00:00)
Title: Get joe branch merged

bulk merge joe dev back into master

worked through some conflicts, there are some rough spots, but comparable to what already existed in master/joe