Merge in temporary Messaging Dev Branch

This is the list of things we determined had to be fixed before we could merge into master: https://wiki.mozilla.org/Gaia/SMS 

At this point the dev-branch now has all of these commits and we can move forward being based in master.