housekeeping
Merge branch 'master' of github.com:svexican/etc