updating gitignore
Merge branch 'master' into vikas
Merge branch 'master' into vikas
making the strings explicit
Units regex is simplified