removed psych gem dep as it messed stuff up...
fixiing mergefails
Merge branch 'master' of github.com:joenas/preek
fix