Merge remote-tracking branch 'upstream/master'
LIB001-546 Reorder mimed facets
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated gitignore and removed DS_Store
Merge pull request #45 from seesmith/master

Removed DS Store and rearranged mimed facets