Trying to put together ours and Brian's
Merge branch 'SendGrid-Android' of https://github.com/danharel/McHacks-2014 into SendGrid-Android