Tweak the un-persistance of select metadata files...
Remove AS metadata file modules.xml from VCS
Merge to master and remove .idea/modules.xml from VCS
Do not persist AS *.iml files.
Finish merge from master.
Ignore the AS modules.xml metadata file.
Merge pull request #14 from BrightcoveOS/metadata-persist

Metadata persist