Remove calc func, switched to using pythonpy
Merge branch 'master' of github.com:bamos/dotfiles