dev cleanup
Merge pull request #142 from rhsu/miscdevcleanup

dev cleanup
Merge branch 'dev'