Add some specs / #16
Add Utils.resolve_file_map
Merge branch 'feature/20140222-file-ext' into develop / #16