Merge branch 'dev'
Removed image archive.

Updated gitignore and remove image archive that snuck in with the last
commit.
Merge pull request #1 from droghio/dev

Small cleanup.
Tree fix

After a few glitches I hope the tree has been fixed. Updated the
gitignore file so this doesn't happen again.
Merge branch 'master' into dev