Squashed commit of the following:

Remove code style changes.

commit 19d1ca597bb26d9669fddca81cf2c46d87c11254
Merge: df9c6cd 6f14cf0
Author: Andreas Richter <andy@richteralsi.com>
Date:   Sun Jan 6 12:52:19 2013 -0500

    Merge branch 'master' of https://github.com/srsgores/calipso into master

commit 6f14cf04731e38b466d78306fbe1a90b6de6c16a
Author: Sean Goresht <seangores@gmail.com>
Date:   Sun Jan 6 01:05:40 2013 -0700

    Add icons to menus.
    Make forms use HTMl5 required and placeholder