Merge pull request #178 from joshbeitler/develop

Merge pull request #177 from joshbeitler/goback
Merge pull request #182 from joshbeitler/develop

Develop
Merge pull request #183 from joshbeitler/develop

Develop
Merge pull request #184 from joshbeitler/develop

Develop
Merge pull request #185 from joshbeitler/master

Somehow we got behind?