add_users recipe
Increase Tomcat memory options.
mst_timezone recipe
Added timezone recipe to system_base.
Removed ntpdate from list of services to restart
fixing merge conflict
Merge branch 'rjhunter-develop' into develop