Development env

Merging work that has been done since 7/18/13