Better device naming
Update documentation
Merge pull request #19 from erichs/master

Update user_data.sh.erb for Trusty Tahr