Merge pull request #2 from alexindigo/master

Add vagrant user to prevent error messaging
Merge pull request #3 from alexindigo/ubuntu_12.04-1

Merge pull request #2 from alexindigo/master