Merge pull request #27 from SonOfLysander/master

More merging.
Merge pull request #28 from SonOfLysander/master

Get everything synced. Almost there.
Merge pull request #29 from SonOfLysander/master

Committing password protected keys.
Merge pull request #30 from SonOfLysander/master

Live encryption and decryption. I will continue with key management tonight.
Merge pull request #31 from SonOfLysander/master

added: going to options screen on first run
Merge pull request #32 from SonOfLysander/master

Pulling in half settings page.
Added send/recieve cypher text from/to extension
Merge pull request #33 from new4931/master

Added send/recieve cypher text from/to extension
Merge remote-tracking branch 'upstream/master'