Fix marmalade repository loading
org correctly
Merge branch 'eric' of github.com:ehuang3/dotfiles into eric