Merge pull request #23 from energee/master

7/23
Merge pull request #24 from energee/master

Updates to modules and logo
Merge pull request #25 from energee/master

Date
Merge pull request #26 from energee/master

Style/wysiwyg
Merge pull request #42 from energee/master

Updates and minor changes
Sidebar edits
Homepage News View styling
Added commerce paypal
Removed bottom line from views display
Fixed merge conflicts from raastar