Mavericks support!
-Also added solr4 as an option