Updates to teamocil and fixing weird rails issue
Merge branch 'master' of github.com:timsegraves/dotfiles