Merge pull request #14 from mbeall/master

Update splash.php to use function nivo_slider()
Merge pull request #20 from mbeall/master

Remove beta in header
Adjust googlemap iframe height
Add function remove_more_link_scroll
Update footer.php
Delete error_log
Ignore error_log
Remove lifepointe_posted_on from article.php
Merge pull request #1 from starverte/master

Merge from starverte