cap initial commit
Merge pull request #4 from hailocab/capistrano

cap initial commit - DON'T MERGE
Merge branch 'master' into permission_system
DAT-768