Updated to Ubuntu 14.04; updated README
Merge branch 'master' of github.com:jonasmalacofilho/ubuntu-luks-suspend

Conflicts:
	README.md