dev updates
Merge branch 'master' of jsridhar:~/github/conf-files