Merge branch 'dev'
functions changes
Merge branch 'dev'

Conflicts:
	functions.php
	styles/css/all.css
lame-o manual merge
Merge branch 'dev'

Conflicts:
	styles/css/all.css
Merge branch 'dev'
word limiting on testimonials class, add testimonial to side-contact-form template
word limit on testimonials-frontpage, change source order on side-contact-form
split up header more, adjustments to page templates
fix testimonial short code bug, more spacing away from logo
help text for services "main header" field
remove extraneous
tweaks all around, add table generator class, getLinks casper script
little bit of cleanup