Merge pull request #32 from ARmadillo-reuse/unstable

MVP Is ready for demo ( no gcm and timezone support yet )
Merge pull request #33 from alexkonradi/unstable

Add SMTP incoming email parsing into database
Merge pull request #34 from alexkonradi/unstable

Add SMTP relay client restart to fabfile
Fix exception (& handling) in EmailReceiver
added logging to system
fixed location bug. changed ipl -> data
Merge pull request #36 from shaladi/master

fixed location bug. changed ipl -> data
Add SMTP incoming email processing

The mechanism uses two pieces of code: smtp.IncomingServer and
smtp.EmailReceiver. The IncomingServer class is run as root, and is
effectively a relay from port 25 to port 7999, which can be connected to
by user programs. The EmailReceiver class runs as a client that connects
to port 7999 and waits for emails relayed from the IncomingServer server.

The EmailReceiver then uses EmailParser and company to process incoming
emails and insert them into the database.
Add SMTP relay client restart to fabfile
Fix exception (& handling) in EmailReceiver
added sqlite3 to gitignore, causing merge problems
added gcm message sender
added gcm message senders
added In-Reply-To and tread_id
fixed merge conflicts
fixed merge conflicts dev and log
made database migrations
Added remote changes from server-unstable to EmailReceiver.py
fixed merges
fixed gcm bugs