This is Dan's branch
Merge branch 'master' into danify
Removed goenv because I don't use it... yet
Merge branch 'master' into danify
Merge branch 'master' into danify
Merged master
Merge branch 'master' into danify
Merge branch 'master' into danify
Merge branch 'master' into danify