removed testing device id code in MappingController
Merge branch 'master' of https://github.com/adamjberg/RIME into David
added filesystem locations
Merge branch 'master' of https://github.com/adamjberg/RIME into David
Merge branch 'master' of https://github.com/adamjberg/RIME into David
Merge pull request #13 from adamjberg/David

David