Cleaning up
Merge branch '2.0.0' of github.com:cr0hn/golismero into 2.0.0