Fix path
Fix username
Minor fixes
Adding bcrypt gem
Fix for hook calling
Merge branch 'trusty' into develop