Merged submodule commits
Merge branch 'master' of github.com:dylansm/dot-files-etc
Removed ember